From 0b2cdd3c30a7491261085a72e27c76821f16ad4d Mon Sep 17 00:00:00 2001 From: Schoumi Date: Sun, 6 Nov 2016 15:56:22 +0100 Subject: [PATCH] Add watcher management in AddPartFragment fix bug on drawer action change --- .../mobdev/lpcprog/activity/MainActivity.java | 3 ++- .../lpcprog/fragment/AddPartFragment.java | 23 ++++++++-------- .../fr/mobdev/lpcprog/fragment/Watcher.java | 16 ++++++++--- ...theme_textfield_activated_holo_light.9.png | Bin 0 -> 236 bytes ...pptheme_textfield_default_holo_light.9.png | Bin 0 -> 261 bytes ...extfield_disabled_focused_holo_light.9.png | Bin 0 -> 346 bytes ...ptheme_textfield_disabled_holo_light.9.png | Bin 0 -> 261 bytes ...pptheme_textfield_focused_holo_light.9.png | Bin 0 -> 311 bytes ...theme_textfield_activated_holo_light.9.png | Bin 0 -> 214 bytes ...pptheme_textfield_default_holo_light.9.png | Bin 0 -> 229 bytes ...extfield_disabled_focused_holo_light.9.png | Bin 0 -> 274 bytes ...ptheme_textfield_disabled_holo_light.9.png | Bin 0 -> 229 bytes ...pptheme_textfield_focused_holo_light.9.png | Bin 0 -> 250 bytes ...theme_textfield_activated_holo_light.9.png | Bin 0 -> 267 bytes ...pptheme_textfield_default_holo_light.9.png | Bin 0 -> 252 bytes ...extfield_disabled_focused_holo_light.9.png | Bin 0 -> 317 bytes ...ptheme_textfield_disabled_holo_light.9.png | Bin 0 -> 252 bytes ...pptheme_textfield_focused_holo_light.9.png | Bin 0 -> 369 bytes ...theme_textfield_activated_holo_light.9.png | Bin 0 -> 326 bytes ...pptheme_textfield_default_holo_light.9.png | Bin 0 -> 321 bytes ...extfield_disabled_focused_holo_light.9.png | Bin 0 -> 442 bytes ...ptheme_textfield_disabled_holo_light.9.png | Bin 0 -> 320 bytes ...pptheme_textfield_focused_holo_light.9.png | Bin 0 -> 445 bytes .../apptheme_edit_text_holo_light.xml | 25 ++++++++++++++++++ app/src/main/res/values/color.xml | 2 +- app/src/main/res/values/colors_apptheme.xml | 4 +++ app/src/main/res/values/strings.xml | 7 +---- build.gradle | 2 +- 28 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png create mode 100644 app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png create mode 100644 app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png create mode 100644 app/src/main/res/drawable-hdpi/apptheme_textfield_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png create mode 100644 app/src/main/res/drawable-mdpi/apptheme_textfield_default_holo_light.9.png create mode 100644 app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png create mode 100644 app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png create mode 100644 app/src/main/res/drawable-xhdpi/apptheme_textfield_default_holo_light.9.png create mode 100644 app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_holo_light.9.png create mode 100644 app/src/main/res/drawable-xhdpi/apptheme_textfield_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_holo_light.9.png create mode 100644 app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png create mode 100644 app/src/main/res/drawable/apptheme_edit_text_holo_light.xml create mode 100644 app/src/main/res/values/colors_apptheme.xml diff --git a/app/src/main/java/fr/mobdev/lpcprog/activity/MainActivity.java b/app/src/main/java/fr/mobdev/lpcprog/activity/MainActivity.java index 8057343..9e8138d 100644 --- a/app/src/main/java/fr/mobdev/lpcprog/activity/MainActivity.java +++ b/app/src/main/java/fr/mobdev/lpcprog/activity/MainActivity.java @@ -175,7 +175,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.O int id = item.getItemId(); Fragment frag = null; final FragmentManager manager = getSupportFragmentManager(); - final FragmentTransaction transaction = manager.beginTransaction(); + FragmentTransaction transaction = manager.beginTransaction(); final Fragment old = manager.findFragmentById(R.id.fragment_container); if(id == R.id.nav_devices) { if(!(old instanceof USBListFragment)) { @@ -200,6 +200,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.O @Override public void onEditPress(Long part_id) { Fragment fragment = AddPartFragment.newInstance(part_id); + FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_container, fragment); transaction.addToBackStack(null); transaction.commit(); diff --git a/app/src/main/java/fr/mobdev/lpcprog/fragment/AddPartFragment.java b/app/src/main/java/fr/mobdev/lpcprog/fragment/AddPartFragment.java index 261ef57..8eb012b 100644 --- a/app/src/main/java/fr/mobdev/lpcprog/fragment/AddPartFragment.java +++ b/app/src/main/java/fr/mobdev/lpcprog/fragment/AddPartFragment.java @@ -77,45 +77,45 @@ public class AddPartFragment extends Fragment { final View v = inflater.inflate(R.layout.add_part, container, false); EditText t = (EditText) v.findViewById(R.id.edit_part_id); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%08x",part.part_id).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%08x",part.part_id).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_flash_base_addr); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%08x",part.flash_base_addr).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%08x",part.flash_base_addr).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_flash_size); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%04x",part.flash_size).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%04x",part.flash_size).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_reset_vector_offset); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%02x",part.reset_vector_offset).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%02x",part.reset_vector_offset).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_ram_base_addr); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%08x",part.ram_base_addr).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%08x",part.ram_base_addr).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_ram_size); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%04x",part.ram_size).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%04x",part.ram_size).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_ram_buf_offset); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%03x",part.ram_buffer_offset).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%03x",part.ram_buffer_offset).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_ram_buf_size); watchers.add(new HexaWatcher(t,this)); - t.setText(part != null ? "0x"+String.format("%03x",part.ram_buffer_size).toUpperCase() : "0x"); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? "0x"+String.format("%03x",part.ram_buffer_size).toUpperCase() : "0x"); t = (EditText) v.findViewById(R.id.edit_part_name); watchers.add(new EmptyWatcher(t,this)); - t.setText(part != null ? part.part_name : ""); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? part.part_name : ""); t = (EditText) v.findViewById(R.id.edit_flash_nb_sector); watchers.add(new EmptyWatcher(t,this)); - t.setText(part != null ? String.valueOf(part.flash_nb_sectors) : ""); t.addTextChangedListener(watchers.get(watchers.size()-1)); + t.setText(part != null ? String.valueOf(part.flash_nb_sectors) : ""); Spinner s = (Spinner) v.findViewById(R.id.spinner_uuencode); if(part != null) @@ -195,7 +195,8 @@ public class AddPartFragment extends Fragment { if (v == null) v = getView(); boolean isValid = true; - assert v != null; + if(v == null) + return; EditText t = (EditText) v.findViewById(R.id.edit_part_id); String hexa = t.getText().toString(); if(!hexa.matches("0x[0-9A-F]*")) diff --git a/app/src/main/java/fr/mobdev/lpcprog/fragment/Watcher.java b/app/src/main/java/fr/mobdev/lpcprog/fragment/Watcher.java index 15dbb4d..6d63889 100644 --- a/app/src/main/java/fr/mobdev/lpcprog/fragment/Watcher.java +++ b/app/src/main/java/fr/mobdev/lpcprog/fragment/Watcher.java @@ -18,18 +18,22 @@ package fr.mobdev.lpcprog.fragment; -import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; import android.text.Editable; import android.text.TextWatcher; import android.widget.EditText; +import fr.mobdev.lpcprog.R; + class HexaWatcher implements TextWatcher { private EditText v; + private Drawable orig; private AddPartFragment fragment; HexaWatcher(EditText view,AddPartFragment fragment) { v = view; this.fragment = fragment; + orig = v.getBackground(); } @Override @@ -46,9 +50,9 @@ class HexaWatcher implements TextWatcher { public void afterTextChanged(Editable editable) { String hexa = editable.toString(); if(!hexa.matches("0x[0-9A-F]+")) - v.getBackground().setColorFilter(0xFFFF0000, PorterDuff.Mode.SRC); + v.setBackgroundResource(R.drawable.apptheme_edit_text_holo_light); else - v.getBackground().clearColorFilter(); + v.setBackgroundDrawable(orig); fragment.modifyBt(null); } } @@ -57,9 +61,11 @@ class EmptyWatcher implements TextWatcher { private EditText v; private AddPartFragment fragment; + private Drawable orig; EmptyWatcher(EditText view,AddPartFragment fragment) { v = view; this.fragment = fragment; + orig = v.getBackground(); } @Override @@ -75,6 +81,10 @@ class EmptyWatcher implements TextWatcher { @Override public void afterTextChanged(Editable editable) { String data = editable.toString(); + if(data.isEmpty()) + v.setBackgroundResource(R.drawable.apptheme_edit_text_holo_light); + else + v.setBackgroundDrawable(orig); fragment.modifyBt(null); } } \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_activated_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..7a3c105e0ed099659289e97029e590783b1aedac GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sf18!y!OVx)_wLL(gN>3NZkc@k8Z+debP~d5KIP=o) z`D@C(%=LD0MR<9Bkr%l0bKwuAYuh{B@842YJbIClOGrgArO~@xnM1{6f`Vfc3#Sl} zA$%f1t=#d`($t-*FQwKViqJ7Xk!890v!{LDJi+aAPG)@AwjhUnQ_7sT3g^YI#fv{R aKFr(dDB_l3BJK-x1cRrmpUXO@geCyv_fWV1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_default_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe6381519578a7c7ffd4bb40fe17a6a2af965e0 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sf18!y!OOXvNwcCI~lRRAq}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sf18!y!3vq*Kvc5o}=bkQ(AsP4H-t^^bRuEu)P}x?o zL~eEa%Z*hkw?FK9*`#5AurFisaj)bCf1`66hiarJCs*)t85>V3yUA9t$v(r0OY=$J z^Jwjt!E!5RlxSJ3vH*%KnE)eF#3x0aTs)D%fa&5a_1&FZ3TyHdCe_F{WS?VhkWRT& zcr#D!f^fv1ZJ$#1?_TbGJjK{-j?)%XzgG&K4{RHQCQPv37Ugr!fAepR6KCH{oU?D$ zNtpvR-%d@85ehK#KQ_5{qvYiKn@Yq?qU%=MI~W>hZt6+6aWznL#g|oKb=K{rI%*8d gOt){oC&nw!#uFGFF!}T(pqCjuUHx3vIVCg!09kH>Q2+n{ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-hdpi/apptheme_textfield_disabled_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c07e4549eb27e0e50ed019bf722d3984fc46bb41 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^nm}yC!3HD`7Jga>q}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sf18!y!bG2s|737eV%P$ zFIJl@#V5q}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sf18!y!GwsGI9~Yp|5lz{jfBO6le%rb{Z)a+E1>M=oz@;*QW1+o8 z$&IE479kIXMksND>qN)o=*Bbqj`7Xhm)CYu{oLnY-qs;J8N3m%)YaDpZQ@k_E>`KX z1E{3+_mnOAlg@D$#HfBf`TebMiiga*a05M?H&0r>d+skP`Fkb#qr%G_1?Sj2_f39x w-tXU^MGG0S>O!@T-n}Y*ZNJ{B{mBxH%j1=f@CV&l0Q3)or>mdKI;Vst0I6$uMF0Q* literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_activated_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..22702557810efd43b91a6b2e4f65bfe3e8738b34 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fSXyw%3%4bQ%itC$(}BbAs)w*6BPLWv_Cq?`_I_m zPx_+mOAp^a6ln0|V8%9ytp!&O1#-LVE}7K&zkMrzd;QlI#&ZsaYtKmjyV=C*zQ0lH zAQx*7^RvVMzr17U?K#Jzylq3OOLs;LXLnFdh=fSXyALzeIOis?Y1B2O2`5Rc<;r*GtKFyLYNAJOMI zqsw!~yUYcR94sz+J@H^aFdh=fSXyAQ&#-W%xgfQ`JOJ0As)xyhDY-qR^ZvJeMR|e zgtbrqRb|DH@9KZP9K6=6w6<4OWlFzl4>91sGHoa(a|z@Tjl3cXYP)lv_fV zjvwNjdx3NA2C0R4YYm>vpKU8Y_o&gNB|o1Chnx{C;}fVCF`QmxqPtS1jo<6b|LJMH zbxd)lllTv0+}`n8*W;V`S3SAP?h?lMs%h1Wc6#SNV!f&|_4%v0i%L@%cjlVtMg06? Q2Xrcfr>mdKI;Vst00;_X4gdfE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_disabled_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6ecf3fe137371235c1b624ae6b5288b08d40e7 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fSXyA)BH?&08oUX$kW9!#N+te=^J?)40u@n-{?Fm z(R^0oRpx?54i*=^o_Mdxhn7$O8>X~(^7hXW9+PrgIczi{Sl`?``h@Rogo0={lh}p^ z);DY=RqcQBGal@I8OD42Nx$pomHQ7|S^Oj8{MYR#tW2KQcIo}%syKf&_I#hYcJmoU UE0!de#~|xHUHx3vIVCg!0FWzF6#xJL literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-mdpi/apptheme_textfield_focused_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..45470afe007ddffd565330f4b3b95b1c26e454ca GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^GC-`v!3HFKYIk}9DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>Fdh=fSXyAi*JX2_i3O|yQhm|h{y5d1O@&-?T-%f{xdfC zlfG#C(!=);1sXg#n6XV_Yr&O6f!yx8OD47cZ{NxgYmhkqFPG+b&Vm|q&mTDOp`UBsOpet32U8!~o3vhG`2XRnu3g~4^cT}=r6TvL ryUjS8(bVHo;$i5em1E~*F3xc7ogB;ZhTrl)Coy=s`njxgN@xNAq?}th literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_activated_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..91af11969f9a5c307763f8b97c8412db4d482b65 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^WQL70(Y)*K0-AbW|YuPgflZe~#~Rgup{-9Vuko-U3d8Ta1acI0YM5MT}H?Yr{V z|H9lHZNVjCso(ycD%&S?d`0KOnM>}L@?0trzigt##{&dDE-rQD2f`N|Jb(#|B0e2C zaA1kizHJR(Cta3Tx}LLVkIl_lJ0rRh5)yo8dawF%aov^QeR-O7uNGLmuwK^2WME*h q;qj~5ZSRl2?#QL70(Y)*K0-AbW|YuPgflZe~$lwx3t0+5v?+JzX3_GVZ;-eUP(3L89T}{bkt` zmt{@dwmDcJ)~H*c_P*|m2igG(eLnjCESl>S>Tl@3_t60mQ1LvR`$6|Y0v4bi@$J}w z178f{qk*b)!@kV^A+~Xw$qUP*jeVtC1Gj{;Ff%htvrg-){Qqp(cJ`Zgwi4k+_hgqz W^GBc9xNi#3Q4F50elF{r5}E)f*jvj0 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xhdpi/apptheme_textfield_disabled_focused_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..f4c5f393be09ef0f2363d990973a3722d0ba335d GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^WQL70(Y)*K0-AbW|YuPgflZe~$l6GNsW`+!2HJY5_^GVZ;-?akL@Ai{bfJb9Od zdFGuZ-7lB;^>&JIf3huSYkeZik;`my)M%yrZOtXGwXU5GEKC3aC8eTWockE1crd{m z-mtrd1{?M-{kl2q-=_UKG0)eR^3>&?oSW;tknOgfFxPqQ#ccgM&HS{q?X{MQ*IhZM z{PNww0|$0pdiAc@<%sd4eM=YR3-T8q6QL70(Y)*K0-AbW|YuPgflZe~$F(J;4mWuQ=}r;B4q#=W<<4Y?W=BpNQ>@4GBI zdw0_HjhY?P&M3Lu-_FXrk4f~D$p0z&*EK`FihRDJ&Bp@-K9fxDu-#|kWy1tzO{w`n z1^l14vieNAlH|I-GhZ;QL70(Y)*K0-AbW|YuPgflZe~$F)q?rk`+-9LJY5_^GVZ;-ZOhl>Akg+OzjJEq z#t#}XXC@aI@+Bo^awxLs966%HbgC^i^4`l2>el?m%>oBc_;0zkP0%n~f1BqTi-ZFW zjLdEVERJv9vCNmx0CU-RBn(g(zZ`UXL2ZEP3D&Ojoy*7(6O7MnXg0pei#%=2-`As^f{k(c|i07#_*Wc@jaxdKF ze!a_7Ooe;L>sj|YADx(M`L*rX%74rE%1!FxUC^a>{eHsB)q7ISSNJY?8}6xf+2C`u yTE#Zj2#@Q!@8`|=F`+R3_rG0w#wJtW3vbw_y*f$ahafN{7(8A5T-G@yGywo&m6a<1 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_activated_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..27df81909fe3a077f8fa9e75b115111550d43e66 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0YIF@!3HFcFAm`bQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#0XMTKpMk7Xa0*c9vZsq?8LWQAyHA@IYVrWtSHr&~ zzW%#uFK^R@qByq&U@@>sT2b8n{mZp~NQP&Cgg4wigTe~DWM4f|9)aZ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_default_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..93ce89888c0309fd062a922d7fc3fa8889bdbb25 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^0YIF@!3HFcFAm`bQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#0XMTKztZ;y!nr`9bDl1aAr-gY-rdOCY#`!#F};dw z*~vJbNqdcax!4M{xVX5Oy_n`iD_xXv{FoZK|B3x-?epFxbF+f1d44l-2q-u-fJx6u zDxQ<_CO9wM%g6!}1(6FFm{>Rh7#NvYG#Y@Uhy#%10%~Ajg=^Dg&}NGV3k57co$9>b z04S>pGAljna@XAOPd<~%FU2z^dMs0^R9PGuvCDT_kgNd69EfRI&Z%;qQgJ_yO?on4 eHzRNB4~Ao>1Uvu!-8>8EGX_srKbLh*2~7ZD?p=ET literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_disabled_focused_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..c5f0f2d343d34fa05f87e6018c6c2f322076e412 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^0YIF@!3HFcFAm`bQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GGLLkg|>2BR0pdfpRr>`sf18!zf0WoR5mu?IUjP9N;jv*Dd-rf!LJLDkIdhvG9 zV!Z>YJ0#1W?~3VB6gwtfbD^c|l*GYrHTo33#fsC6|Sw8Sx3SL zEcAh^lzU_O^5g5zPgOat(ti1Iz4W|m?~_@LF9tB*_2Yhrgqu6z0L_~+%@pFFkQ8O?ks`O`#|^Cwqx z?patHH|fr8{^cq+2BR0pdfpRr>`sf18!zfK{okCCz63eXFXjULn>~)y{pLA>>%QL(Og1= z`{knuU-9d$Aq$srH9GK2*mhv&B$i^PN9jgCRsToER>m!Q9Wwb=;tg?!1_nkZ5fJG$ zNyT$gNwbXBTV4eap9@5?3IIta4j{?M!XdDLfr*790H}dQ1FkKLF~aZ%6IjS9R!{m@ zD~Ra{G|MV@cG#OelMFrYdDgSGD9)VpWTMU4Lzi+lO?lM-G6!m!wAN>jOCJuIPgD7y e<5;}) literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png b/app/src/main/res/drawable-xxhdpi/apptheme_textfield_focused_holo_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..efeb1ce1a55ac362062c6788f91c10e8942d244f GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0YIF@!3HFcFAm`bQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#0XMU#pm?d!i-`;jj9#8Djv*Dd-rjZeYj%)mxG100 z!(Q-KbH@zzmq#sHv#0BI7(Pgg$uOEC7m-+;Pizcr%xG{?0kI=U&UJ%&r+x zJg=EJ1QZ+^z@+CS70*e26WYD9nGu4FEF1z07?@Z%0vH&XSTq`dq=*BMz~xz(oOv3^}(wzcRSll?Ss+3 z9F`bNplzt2LY`TzZ6C4%zmt}>T)o)7yJ@!3#m z-lZeKuiw}%%f5GY;`d_SlGf;nQ+aEr0{yli?CKQ1<7aclJn!W;J`3v3cP}z!c-I&W PiWUY>S3j3^P6 + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml index ba55cb6..6d56a1b 100644 --- a/app/src/main/res/values/color.xml +++ b/app/src/main/res/values/color.xml @@ -2,5 +2,5 @@ #000000 #000000 - #FFFFFF + #000000 \ No newline at end of file diff --git a/app/src/main/res/values/colors_apptheme.xml b/app/src/main/res/values/colors_apptheme.xml new file mode 100644 index 0000000..31e082d --- /dev/null +++ b/app/src/main/res/values/colors_apptheme.xml @@ -0,0 +1,4 @@ + + + #cc0000 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ef9f16..c34a8e2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,15 +36,10 @@ http:// https:// - MainActivity Open navigation drawer Close navigation drawer - Settings - - - Hello blank fragment Devices List µC Definitions µC Name @@ -75,7 +70,7 @@ Copy file into Memory Verify Checksum Flash Binary - Flash Suceed + Flash Succeed Step Yes diff --git a/build.gradle b/build.gradle index 573f4fd..ef7ae5a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files