From dc1b04f3ed773fa5b58e66513487579128d3ce9d Mon Sep 17 00:00:00 2001 From: Neslihan Date: Sun, 14 May 2017 15:51:50 +0300 Subject: [PATCH] Switch map button accoding to map and list --- .../main/java/fr/free/nrw/commons/Utils.java | 10 ++++++ .../nrw/commons/nearby/NearbyActivity.java | 29 +++++++++++++----- .../free/nrw/commons/theme/BaseActivity.java | 5 +-- .../res/drawable-hdpi/ic_list_white_24dp.png | Bin 0 -> 116 bytes .../res/drawable-hdpi/ic_map_black_24dp.png | Bin 310 -> 0 bytes .../res/drawable-mdpi/ic_list_white_24dp.png | Bin 0 -> 86 bytes .../res/drawable-mdpi/ic_map_black_24dp.png | Bin 222 -> 0 bytes .../res/drawable-xhdpi/ic_list_white_24dp.png | Bin 0 -> 95 bytes .../res/drawable-xhdpi/ic_map_black_24dp.png | Bin 363 -> 0 bytes .../drawable-xxhdpi/ic_list_white_24dp.png | Bin 0 -> 94 bytes .../res/drawable-xxhdpi/ic_map_black_24dp.png | Bin 513 -> 0 bytes .../drawable-xxxhdpi/ic_list_white_24dp.png | Bin 0 -> 100 bytes .../drawable-xxxhdpi/ic_map_black_24dp.png | Bin 667 -> 0 bytes 13 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_map_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_map_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_map_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_map_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_map_black_24dp.png diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index 0ece6e119..52ff8422c 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -1,7 +1,9 @@ package fr.free.nrw.commons; +import android.content.Context; import android.net.Uri; import android.os.Build; +import android.preference.PreferenceManager; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.assist.ImageScaleType; @@ -306,4 +308,12 @@ public class Utils { public static boolean isNullOrWhiteSpace(String value) { return value == null || value.trim().isEmpty(); } + + public static boolean isDarkTheme(Context context){ + if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",true)) { + return true; + }else { + return false; + } + } } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index 0f8f176de..d2e14956e 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -3,6 +3,7 @@ package fr.free.nrw.commons.nearby; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.view.Menu; import android.view.MenuInflater; @@ -71,6 +72,11 @@ public class NearbyActivity extends BaseActivity { return true; case R.id.action_map: showMapView(); + if (isMapViewActive) { + item.setIcon(R.drawable.ic_list_white_24dp); + } else { + item.setIcon(R.drawable.ic_map_white_24dp); + } return true; default: return super.onOptionsItemSelected(item); @@ -83,9 +89,16 @@ public class NearbyActivity extends BaseActivity { if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) { setMapFragment(); } + + } else { + isMapViewActive = false; + if (nearbyAsyncTask.getStatus() == AsyncTask.Status.FINISHED) { + setListFragment(); + } } } + @Override protected void onResume() { super.onResume(); @@ -160,22 +173,22 @@ public class NearbyActivity extends BaseActivity { * Calls fragment for map view. */ public void setMapFragment() { - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - NearbyMapFragment fragment = new NearbyMapFragment(); + FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); + Fragment fragment = new NearbyMapFragment(); fragment.setArguments(bundle); - ft.add(R.id.container, fragment); - ft.commit(); + fragmentTransaction.replace(R.id.container, fragment); + fragmentTransaction.commit(); } /** * Calls fragment for list view. */ public void setListFragment() { - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - NearbyListFragment fragment = new NearbyListFragment(); + FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction(); + Fragment fragment = new NearbyListFragment(); fragment.setArguments(bundle); - ft.add(R.id.container, fragment); - ft.commit(); + fragmentTransaction.replace(R.id.container, fragment); + fragmentTransaction.commit(); } } diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java index f52ea84dd..b0be190a4 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java @@ -6,16 +6,17 @@ import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import fr.free.nrw.commons.R; +import fr.free.nrw.commons.Utils; public class BaseActivity extends AppCompatActivity { boolean currentTheme; @Override protected void onCreate(Bundle savedInstanceState) { - if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) { + if(Utils.isDarkTheme(this)){ currentTheme = true; setTheme(R.style.DarkAppTheme); - }else { + } else { currentTheme = false; setTheme(R.style.LightAppTheme); // default } diff --git a/app/src/main/res/drawable-hdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f8f7e7dda6e4a5b45a97917c20dfaeddc3645077 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;wWo_?h{y5d1PRu~2@%cz`Tk2c zTwv_<E5juBY?z2sqDoGA^{8xbs2ogzZvA71C3$u MboFyt=akR{08!Q;k^lez literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_map_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_map_black_24dp.png deleted file mode 100644 index c81d0e068acbc551a151c33afe485465188c5df3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}P)KSap~0CWGw`{s-kMDGW;7V=~EZ@DG^oV6kA6>no9gQM#k7 zm)xTyT~D{8&K;fCXFAXG^sb`=nMsSrBpI+IFTuEqJMriKTQelorKIXjY)e}On{LIy zn$9ff1B}>F|GtX|{c{}zYVKRUUL9F=s`=whL?{vmi!f!^Q*fRt1Ub|8J$D`gx|N)F z9s;5)l!da;p9o!;(~~w7?!|!_xwN5hb$g0!-&B4JH62@4)o3|;P!s-qF)8$D+c2Ql zyc6%@U{}`VwN(*oI5aCKG-$=;SK`KoQ3>+O`XwnSn~+-O19Z^kOjb<{Qvd(}07*qo IM6N<$f~&QL(EtDd diff --git a/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..15d8fc2bb488d6654651ec05f3ecba1fb7163394 GIT binary patch literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Sx*gTe~DWM4fOr#gq literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_map_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_map_black_24dp.png deleted file mode 100644 index bcc500e96c932305d591e06d403c4c807984aac6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+irJgR1Ar*{oCvD_A7$D(xe*Omz zA+}CEU!Gc~i8J=}99bij^q5tpZ1#77#S2X(kEk7C?g$bp|H0;L{qn(`w|Cy>*t;%2 z*&-|GY_rjAx~O)wbPuCF z&p$`Y{DM?R>C;jw?*#hKa2&b6kF}cZ%8CogXM>MLJJ|&I>AXxxl4@}|((^&nOh4uO W^;H*Q*G&XEn8DN4&t;ucLK6U1?pIL& diff --git a/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2b7253975cc58f5814084bab87ca50729cbfa262 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUN*z7jegvM zQ%;@U%Ji=LeENKbdk^aUd~L7gA(u;D$88@>^c_-N%fQr7t=evx2+`iUW}o7=xZs69 z!oO8?MBi8_+|nzT?G|^;eKR3iX)Qe?p>hjPUDUM06+>ZVrOkxG9e2lc<(>N}6t1*T zGT@{Kz6kNw3&3WlZTOxJ0Jb^riA6d9*p(Xap8*-jKn609feh?P4gB`ZCCwy2w7Eyl zXe0rmef7{Oo7M^Z@NMOry6c2cxKHW>UhCR!t8*UvB~kiZdKD(zaZl|u7mO|l1 zdJY3sz|wPPH59kkRd0l7V>caDtD%p2_N(ro8z$Zx=*Z;~_ZO6jUUM=WXyO0>002ov JPDHLkV1ihOr%?a^ diff --git a/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4d2807e4ebe3f77a5b830c06d76082532d9a91de GIT binary patch literal 94 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJdE%Zfjv*C{ p$r5b~`u^Gr{8653n)QAHJHzX3N$>My@67>e^mO%eS?83{1OWFN8fX9j literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_map_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_map_black_24dp.png deleted file mode 100644 index 827c9fc9f114e51cbaa1db0e9dd47dff133ce1d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 513 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKNz<9#b#WAFU@$I?2-dD334tzXs z_|kQQ#>u4`OT{&dy4kX|IWjvGy2LUCn>;#LF0MEx(;}r6#ig`JQRbE2-Q6()DvmmS zVZjL(6rKu9N?iGq#V`HEkAgaTi#ZQ}*8Okn57CVvw9r=x$ViS zv!;`sPOgu+v}P0Ej#RgZ%D`jacC6C)^Hue~W&Yxd-d(+%OIPoR{k2zc(Rt~zTUAeA zeYh}3A%%VGD`UlwFKgWUq8D#jTU9G?N`~LJs+W7_|3`g%tff}G(E=?s3${CbDKq!w zTy67ovw*E!(~p3H8?o`NKdv$|ezmgwwztgT09(54_tii;?e4$tyMeS>xX%?Kj*Qi& z6Ii?!U_q-AFZ_#QW_7JC3y~G6yxGA$YZYJDo(J;JO+fr}!s=JTf%Gw3cac@Rvpxkz zJoRVW%6(D&Q*&L_s~JpuJ9DE>{MZy|Yxa~`^y`g9Tddq|Kdf~+Gvo9&=19lQ@2pqE zyq@#v%pQT-nDuiV$}V*1@jfzr_32WQAHBDw}vZo+3Bkj t#$Aj0GW*N9(%er|y_N>8w2$kY(z%DR8W^(-44$rjF6*2UngFD$=3D>( diff --git a/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_list_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2a6d3b0449b8c59366b29c2209bb23e80325080c GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@?O(%@xS>XdsLA^!WH|)|0G!%Hn8t^oG?pW9;DsV)z4*}Q$iB}k@*`j literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_map_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_map_black_24dp.png deleted file mode 100644 index da75c65bb5e60af90e8bcb091ef13d57d2f2afc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 667 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z?9_a;uuoF`1Y2+$K^zs;~&4z zx}tP}@1loG>}mm{#d@O3R;qGL3l9YcTvF^>qq8X{HTKd1gumq!>{DcJfBt;)VdMMP#sBT9<;#8>>N{~Lwg@b0``j~0!HeVe zs~yK!G^I4VOy?*!&e~|9%d&Cd6lR{6yHz&o_)OWp!g6|IL)xhidD^yroX*ZNRrE9L zIknq_|E4d4vE!{D7SC#YEsa`XVZm_k{e6epMLwm(C|L8j!>5-fV*mnJF)G9dkE5L2_ z(#eJ)jnXMMKJ44LW;y$|f@T%2-^S1WGTMK=lX&SWgYE%6xd~;a4%*4`%qcOv7n-&R zl$$$n3#J~q%doaj?^rA!!w11as{@B>IVUg>hZ=H!+~EtTdB`Pwm-oVN2lmx>crR4D zYHI^cKmBROU!77@2Yp|8Umc*W`CYqB0v=^G#7&y*@}Y9ae9f{03LBgD8_F*3E^Yf> z-7Ri#Ff@yC#UqpV0n?^G)nt#1=xNaTYx1|eN>}`6%cc#PNiqv%&So7**9-8>o4xZ~ z`JVq@EY^lBh~)io*!ESVLtWjr;@R_${a+>=vM7?zqo5~sM&uE{cb}!FmaorTEOoZ% zfXMb6E#*t!EVX~mz9BzDy(d-k%TI~3ItSaH$~