From dce1c0715e48d2ba34d020be0c2e8b7df0328617 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 2 Oct 2020 12:08:33 +0100 Subject: [PATCH] move Unpublish button --- .../java/io/lbry/browser/MainActivity.java | 1 + .../ui/findcontent/FileViewFragment.java | 5 +++ .../main/res/drawable-anydpi/ic_unpublish.xml | 6 +-- .../main/res/drawable-hdpi/ic_unpublish.png | Bin 0 -> 302 bytes .../main/res/drawable-mdpi/ic_unpublish.png | Bin 0 -> 208 bytes .../main/res/drawable-xhdpi/ic_unpublish.png | Bin 0 -> 388 bytes .../main/res/drawable-xxhdpi/ic_unpublish.png | Bin 0 -> 504 bytes .../main/res/layout/fragment_file_view.xml | 37 ++++++++++++++---- 8 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_unpublish.png create mode 100644 app/src/main/res/drawable-mdpi/ic_unpublish.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_unpublish.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_unpublish.png diff --git a/app/src/main/java/io/lbry/browser/MainActivity.java b/app/src/main/java/io/lbry/browser/MainActivity.java index fbfb7b6..d36fd08 100644 --- a/app/src/main/java/io/lbry/browser/MainActivity.java +++ b/app/src/main/java/io/lbry/browser/MainActivity.java @@ -3122,6 +3122,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener // TODO: Broadcast startup status changes JSONObject startupStatus = status.getJSONObject("startup_status"); + android.util.Log.d(TAG, startupStatus.toString(2)); sdkReady = startupStatus.getBoolean("file_manager") && startupStatus.getBoolean("wallet"); } } catch (ConnectException | JSONException ex) { diff --git a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java index 9af054e..de9ce01 100644 --- a/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/findcontent/FileViewFragment.java @@ -28,6 +28,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.AdapterView; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; @@ -2790,6 +2791,10 @@ public class FileViewFragment extends BaseFragment implements Helper.setViewVisibility(root.findViewById(R.id.file_view_action_report), isOwnClaim ? View.GONE : View.VISIBLE); Helper.setViewVisibility(root.findViewById(R.id.file_view_action_edit), isOwnClaim ? View.VISIBLE : View.GONE); Helper.setViewVisibility(root.findViewById(R.id.file_view_action_unpublish), isOwnClaim ? View.VISIBLE : View.GONE); + + + LinearLayout fileViewActionsArea = root.findViewById(R.id.file_view_actions_area); + fileViewActionsArea.setWeightSum(isOwnClaim ? 6 : 5); } } } diff --git a/app/src/main/res/drawable-anydpi/ic_unpublish.xml b/app/src/main/res/drawable-anydpi/ic_unpublish.xml index 802a3e6..0746204 100644 --- a/app/src/main/res/drawable-anydpi/ic_unpublish.xml +++ b/app/src/main/res/drawable-anydpi/ic_unpublish.xml @@ -5,7 +5,7 @@ android:viewportHeight="24" android:tint="#FFFFFF" android:alpha="0.8"> - + diff --git a/app/src/main/res/drawable-hdpi/ic_unpublish.png b/app/src/main/res/drawable-hdpi/ic_unpublish.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c20cced5c395a01d3d3f333ac6e32b2262d5c2 GIT binary patch literal 302 zcmV+}0nz@6P)Nkl#BeU&;tXoAOk-0?-aMh4bZ@}6F9^7)f_S{-~vRB__1v&866>VM90c>31v2(5@sfD zrZ8p}X4;V52ebkJ$eC^VhP+%w8-C`!l_5HgfdUqGm*ge)}>1O6MR4;?5W zmb8DibE^_6v1GQYpcc37m8is6pmfYt7FU1#7&FL>bso?}9$}de`Q7hagAOqj6X;{I zi{hKv3dvJ5%T@YAMmJdd_66DEGsFI~;c8Oa3;3W-7&9D^zyJUM07*qoM6N<$f~L25 A0{{R3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_unpublish.png b/app/src/main/res/drawable-mdpi/ic_unpublish.png new file mode 100644 index 0000000000000000000000000000000000000000..b75d5bfb309a3853878f92f0077682d9c5aa264c GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj(>+}rLn>}1CrEsI@c;k+eGW1F zN4y(<@QCQQcHIn4+Q2N3?_?w*&bG2p;p&GZB_6lqu3JoG+PXVArx}YRvDb*@ENfz& z{bA`e3iuEu6p7*9#Hf$2|@bEUq_7o^Fe`Biex z!nOI@f$_Ju;VNZX59U|3R#VEe`4>b;Y4b_UM!|}URh-HD2>@U+ss|d>0GMCZn5?h@ zOxY0t1_;280B}G6ex$1upvrXsDqw(82cQE6=yU*jV1Ql+Kx;Aw4Wpg^jQ|ngJiq{4 z#KSE-D0On`oL$08YRX|dS+3Hg|_@fk! zdhiL+Ik_+Jluj&h8LF^nM_(Ja7aW_EviUZcw=1Td6`L9MPNN#@|B~-Z7h9?V+}jil i>RAbM%^D-dAH);&LjQ>gZ866H0000 zSq4E61VPXnTGzF3zBxC}#(8wMJCF3Nq2CrU1IeAg=nvbIHuSDMmX^|afO6zcWy>Nk zh7rtvt*X${mAVVT?A?g%dhWwY=Q$vp%|G8zN`rG30A}yIlrHrU2xs#nSeH`(CmbY2 zaKb=R2ImjbRd8yBa5mRhq;jj=C1>23BLFnB#G}9?WZ!N%=2kW`7d`=*2mu+io-10B zdr2QLpx#I3vXMJK1E@*>P=(;k6|570^J`=;j%-G?s8j&mJ^|Dw1gJ%T_8q7X%E5d= z&(Em;Q$XXT8B8G{3qSw_K;i&R2?3gr<{8pF28x(!oSSN3vWn%7lSu^&W>|7Pz2u5T zdz5`pIOH!sqx6i;3tk}gNlz_a%xFsla2B==o!EkhO`P5!4M}IM7vqs8NJFUI_5r9ep2(Snl=aiX5QI`uj;%-%(hQ^`Z_ds#Bs6L7d2dL{+9xoQCqPSS# uNz1xX%rFOK?unkY(O*pgK@bE%EcyoHp$PChP4&9~0000 + + + + + + + -