From 876c6e819ab6155eb9e3b76cbe9b67a32f05232d Mon Sep 17 00:00:00 2001 From: Steven Schoen Date: Mon, 28 Sep 2015 10:59:38 -0400 Subject: [PATCH] Remove extra title from Add Transfers, add Search indicator when searching --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 3 ++- .../putionew/activities/AddTransfers.java | 4 ++-- .../stevenschoen/putionew/fragments/Files.java | 4 ++-- .../drawable-hdpi/ic_currentfolder_search.png | Bin 0 -> 1060 bytes .../drawable-mdpi/ic_currentfolder_search.png | Bin 0 -> 706 bytes .../drawable-xhdpi/ic_currentfolder_search.png | Bin 0 -> 1469 bytes .../drawable-xxhdpi/ic_currentfolder_search.png | Bin 0 -> 2378 bytes .../drawable-xxxhdpi/ic_currentfolder_search.png | Bin 0 -> 3249 bytes app/src/main/res/layout/dialog_addtransfer.xml | 12 +----------- app/src/main/res/layout/files.xml | 4 ++-- app/src/main/res/values/styles.xml | 6 ++++++ 12 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_currentfolder_search.png create mode 100644 app/src/main/res/drawable-mdpi/ic_currentfolder_search.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_currentfolder_search.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_currentfolder_search.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_currentfolder_search.png diff --git a/app/build.gradle b/app/build.gradle index 21f01eb3..c7650d02 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 89 - versionName '3.1.3' + versionCode 90 + versionName '3.1.4-beta1' } compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01ebc5e3..dee50313 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,7 +78,8 @@ android:theme="@style/Putio.Dialog" /> + android:label="@string/add_transfers" + android:theme="@style/Putio.Dialog.NoTitle"> diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java b/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java index 646f165b..16e3304d 100644 --- a/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java +++ b/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java @@ -7,7 +7,7 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.FragmentActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -29,7 +29,7 @@ import java.io.FileNotFoundException; -public class AddTransfers extends FragmentActivity { +public class AddTransfers extends AppCompatActivity { public static final int TYPE_SELECTING = -1; public static final int TYPE_URL = 1; public static final int TYPE_FILE = 2; diff --git a/app/src/main/java/com/stevenschoen/putionew/fragments/Files.java b/app/src/main/java/com/stevenschoen/putionew/fragments/Files.java index 8bef0c01..5b0eb966 100644 --- a/app/src/main/java/com/stevenschoen/putionew/fragments/Files.java +++ b/app/src/main/java/com/stevenschoen/putionew/fragments/Files.java @@ -309,10 +309,10 @@ private void refreshCurrentFolderView() { textCurrentFolder.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20); if (state.isSearch) { - iconCurrentFolder.setVisibility(View.GONE); + iconCurrentFolder.setImageResource(R.drawable.ic_currentfolder_search); textCurrentFolder.setText(state.searchQuery); } else { - iconCurrentFolder.setVisibility(View.VISIBLE); + iconCurrentFolder.setImageResource(R.drawable.ic_putio_folder); textCurrentFolder.setText(state.currentFolder.name); } } else { diff --git a/app/src/main/res/drawable-hdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-hdpi/ic_currentfolder_search.png new file mode 100644 index 0000000000000000000000000000000000000000..d739178eedc3b735bc064b2a47a97b71d95018ce GIT binary patch literal 1060 zcmV+<1l#+GP)7{`Ct5FQA5Ks+E1gb)v=2qh(BhLE8QA!W|+K*=nGWJ)1ZrUwxU$xxCgN*Nv` zQ9=-*OCTi>w0wRRcRbd*(7E=pj<=Gl_RN*>F| z4wOPMBaW~(BQ1|L2ZjN?f%ZUCpbqdEcnLfNt^yZ;PuA8Yn3xo-C9ndR1k|&z;|;JQ z_*bQXzF?A@2CN4fTL49;JO*X~*F9vdM0~(%02_csRx9M6^bME^989Pur?@Ma=5Ndc z^$s`-+yI^fUx0={J76F%7^oYu;yW-AIGHw_E7){kZ^Q`g{I@*j!-9b)-O695H4p62s ztALde>!zfcZ?<4Mr=CShx(dkB*saSwp*C;@=wtkRJMfyP%D=^I!Bm=e8KNo_%9+Y? zD$c;3z)h&Q6aEG|0gvJYZGN`}I|7V16z&I9NRkfaRyRY*TwrHXrINP=Q^o3REI1iB zl!5_Ufcb_VRa~8IiH9xN>!AM&7gSGpEAi?uC*q-Vz|a)*T6^q0(8yS@Yf9(NRN#Q2 z_cAc(e}bt)Z(%IhAGnr+0SZHfV>r~gj7&kVwZ~M7dl(BUgv=`GYm0KqEJEsF%$)Pp zYYnysn33|%)&iaYt*W3XS%ZxOju{4g4bGgW-dkGUiXAuP)ycF0UM0|3A!=I{>j%55 zn{hZ!17m<+9)>gl?f|U~*)usBWDnKlBDP?fyF6%K&Bc}lmrWM~)J~lMMi@fsItHXv zketEfHSMzQSK*MiRtLZ~ow+=vf?+~Q*HK`C%kIR@b@7;V^#v{k4>hK4T`tuSt9s@d zDipeht&N1A=ITb1n;DA{5*vU_n}8nH8`QE}!R| z!!k=?AzZ$kb1EoV1B(mG?LoNyj7#V&g2jcUJh!k|!SZ=dA2Ia#>TofGg>ZT5IeFOil*T;gHKobAQJ1TP_P)lV!e}VLJ7=k+X^UD@>l^k-)rfT$Go#&tmi`0DuBkVt_#-3$0000KZdwKqYp7&+(+}-oP=lt&Xo_o%@_i6K=jkf=cM+>OzL|PGQW`w$84i;fD z2I4!O;wnz!O4)*C^Hq;*B911IBF%GHiRWbtH=3^kG#97PBPa3__YqMWjefbgX9%C$ ze*;wp6p^`vo=H58WNZ5NEq&{b`Ph-*;`1X+!|S?GML@CpYq?{JBU^>94HoH*Gnk#` zk70Q;f#%_SE;6$UV6t`l;}!-b+p&012dXGS$FVGl#jY<_6kd&k$#ye#RrLF1Rs?hh zV-N{E7+KDg=?_gg6n0T{3(Fkx^F=@(5P5MKGi!*3<~#JkO-!ocTNt4b?VFn3^ctdF z@E*Nz15;}F76L_bPDs0ruKcB=j*$bLa?GB&E16LcGe@j%~>>68vx# zr_81(hi0Vw3EO+A(S0ltABF2Fe?DO(UNs9Sbk1Ty61;#Vc-vrsfC>9JvKTwDr4CG4 z*~fg8d)(whlJE=cOA9|qZ6iPebWN(tFnx&e_}pxu&>NTf$*^|fQAu&VL^b6{zzoM5 zoWOegs0vngxn?>8up3L!t$}#t%%RkoA0vEXMAu%I-cF@lRe>_05m=0=>As2wS{z+8 z&v>F_3A`U`bE^kb{4R}DU7*q(CWFvDkn$??sRY$gKmidQJ0cayo{hcOSQM#_1j?$o zeWdnaQzNL32FjqKAU5P86;G0Qn*2681E@VzJY(XIK)gWz8Bhil-8=p^{ShWJs#-an oV%J$mR(Ufmpt4Z4B2*TkpLI`fCAAM~{r~^~07*qoM6N<$f{!pg761SM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-xhdpi/ic_currentfolder_search.png new file mode 100644 index 0000000000000000000000000000000000000000..7f417a5c359cf694a27399f88fb247bd23ba484f GIT binary patch literal 1469 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 C73rt| literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/dialog_addtransfer.xml b/app/src/main/res/layout/dialog_addtransfer.xml index b8bcdfbc..c12dc8e6 100644 --- a/app/src/main/res/layout/dialog_addtransfer.xml +++ b/app/src/main/res/layout/dialog_addtransfer.xml @@ -3,16 +3,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - diff --git a/app/src/main/res/layout/files.xml b/app/src/main/res/layout/files.xml index ffb7cc13..7f64a415 100644 --- a/app/src/main/res/layout/files.xml +++ b/app/src/main/res/layout/files.xml @@ -43,8 +43,8 @@ android:layout_width="36dp" android:layout_height="36dp" android:scaleType="fitCenter" - android:src="@drawable/ic_putio_folder" - android:tint="@color/primary_text_default_material_light" /> + android:tint="@color/primary_text_default_material_light" + tools:src="@drawable/ic_putio_folder" /> @color/putio_accent_dark @color/putio_accent false + false + + +