From 0585fb3eb1f390a3165f1ab534ac6b8c322c276c Mon Sep 17 00:00:00 2001 From: Chteufleur Date: Sun, 7 Oct 2018 20:54:42 +0200 Subject: [PATCH] Change menu to a nice one. --- ...le__android_arch_core_common_1_0_0_jar.xml | 11 - ...ndroid_arch_lifecycle_common_1_0_0_jar.xml | 11 - ...__android_arch_lifecycle_runtime_1_0_0.xml | 12 -- ...upport_animated_vector_drawable_26_1_0.xml | 12 -- ...om_android_support_appcompat_v7_26_1_0.xml | 12 -- ...dle__com_android_support_design_26_1_0.xml | 12 -- ...android_support_recyclerview_v7_26_1_0.xml | 12 -- ...support_support_annotations_26_1_0_jar.xml | 11 - ...support_support_annotations_27_1_1_jar.xml | 11 - ..._android_support_support_compat_26_1_0.xml | 12 -- ...android_support_support_core_ui_26_1_0.xml | 12 -- ...roid_support_support_core_utils_26_1_0.xml | 12 -- ...ndroid_support_support_fragment_26_1_0.xml | 12 -- ...id_support_support_media_compat_26_1_0.xml | 12 -- ..._com_android_support_support_v4_26_1_0.xml | 12 -- ...support_support_vector_drawable_26_1_0.xml | 12 -- ..._com_android_support_transition_26_1_0.xml | 12 -- app/src/main/AndroidManifest.xml | 2 +- .../mytrackingdog/MainActivity.java | 202 ++++++++++++------ .../res/drawable/ic_check_box_checked.xml | 9 + .../res/drawable/ic_check_box_unchecked.xml | 9 + app/src/main/res/drawable/ic_import.png | Bin 0 -> 4076 bytes app/src/main/res/drawable/ic_menu.xml | 9 + app/src/main/res/drawable/ic_menu_app.png | Bin 0 -> 1750 bytes app/src/main/res/drawable/ic_share.xml | 9 + app/src/main/res/layout/activity_main.xml | 33 --- app/src/main/res/layout/content_main.xml | 20 -- app/src/main/res/layout/main.xml | 148 +++++++------ app/src/main/res/menu/drawer_view.xml | 35 +++ app/src/main/res/menu/menu_main.xml | 42 ---- app/src/main/res/values/strings.xml | 3 +- 31 files changed, 291 insertions(+), 430 deletions(-) delete mode 100644 .idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml delete mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml delete mode 100644 .idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_animated_vector_drawable_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_appcompat_v7_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_design_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_recyclerview_v7_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_compat_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_fragment_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_support_vector_drawable_26_1_0.xml delete mode 100644 .idea/libraries/Gradle__com_android_support_transition_26_1_0.xml create mode 100644 app/src/main/res/drawable/ic_check_box_checked.xml create mode 100644 app/src/main/res/drawable/ic_check_box_unchecked.xml create mode 100644 app/src/main/res/drawable/ic_import.png create mode 100644 app/src/main/res/drawable/ic_menu.xml create mode 100644 app/src/main/res/drawable/ic_menu_app.png create mode 100644 app/src/main/res/drawable/ic_share.xml delete mode 100644 app/src/main/res/layout/activity_main.xml delete mode 100644 app/src/main/res/layout/content_main.xml create mode 100644 app/src/main/res/menu/drawer_view.xml delete mode 100644 app/src/main/res/menu/menu_main.xml diff --git a/.idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml b/.idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml deleted file mode 100644 index 0647ff1..0000000 --- a/.idea/libraries/Gradle__android_arch_core_common_1_0_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml b/.idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml deleted file mode 100644 index 7d25f6b..0000000 --- a/.idea/libraries/Gradle__android_arch_lifecycle_common_1_0_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0.xml deleted file mode 100644 index 9741ce9..0000000 --- a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_0_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_26_1_0.xml deleted file mode 100644 index bbaa371..0000000 --- a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_26_1_0.xml deleted file mode 100644 index c0dea90..0000000 --- a/.idea/libraries/Gradle__com_android_support_appcompat_v7_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_design_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_design_26_1_0.xml deleted file mode 100644 index 019fa17..0000000 --- a/.idea/libraries/Gradle__com_android_support_design_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_26_1_0.xml deleted file mode 100644 index 43bee7b..0000000 --- a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml deleted file mode 100644 index 3371151..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_annotations_26_1_0_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml deleted file mode 100644 index 1517ad9..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_annotations_27_1_1_jar.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_compat_26_1_0.xml deleted file mode 100644 index 1f81931..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_compat_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0.xml deleted file mode 100644 index 2b5fa4d..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_core_ui_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0.xml deleted file mode 100644 index 8bcea53..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_core_utils_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0.xml deleted file mode 100644 index 6f59618..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_fragment_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml deleted file mode 100644 index 70817ae..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_media_compat_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml deleted file mode 100644 index 7f215b6..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_v4_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_26_1_0.xml deleted file mode 100644 index 2e34970..0000000 --- a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_android_support_transition_26_1_0.xml b/.idea/libraries/Gradle__com_android_support_transition_26_1_0.xml deleted file mode 100644 index e99bebd..0000000 --- a/.idea/libraries/Gradle__com_android_support_transition_26_1_0.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 821655e..2453eaa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/Theme.AppCompat.Light.NoActionBar"> @Override @@ -407,6 +473,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu serviceTrackingDog.importGpxTrace(new File(data.getStringExtra(FilePicker.EXTRA_FILE_PATH))); updateDogTrace(); updateTrailTrace(); + updateSendTraceMenu(); // Update distance distance = serviceTrackingDog.calculTrailDistance(); @@ -516,6 +583,7 @@ public class MainActivity extends AppCompatActivity implements IOrientationConsu this.add_object.setVisibility(View.GONE); this.start_stop_dog_trace.setVisibility(View.VISIBLE); } + updateSendTraceMenu(); } private void changeStatusDogTrace() { diff --git a/app/src/main/res/drawable/ic_check_box_checked.xml b/app/src/main/res/drawable/ic_check_box_checked.xml new file mode 100644 index 0000000..9948171 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_box_checked.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_box_unchecked.xml b/app/src/main/res/drawable/ic_check_box_unchecked.xml new file mode 100644 index 0000000..cf8bfa2 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_box_unchecked.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_import.png b/app/src/main/res/drawable/ic_import.png new file mode 100644 index 0000000000000000000000000000000000000000..6502ab98c575c76d2f76a7d4bda85e1b1cea151a GIT binary patch literal 4076 zcmeHKYg7|w8h&ROC8%5i6rlvsaIMNksS;ca3Za?;;D7*tj{1K5`Ec`MiDRt-E-UEF0@*`%)?h*3paHkIsT&hz^G-o)NlQAtdz?=6^@ z*@v{ethsJ8k7a%0+xlkaI@yu=;XfYgl$IT8+IZ)0oVCndJ8vy3TKU81`mRw;AsCY@U9>4mc#$u+YmK* z-?RJbSR~c-kUzX2HIblvby0gOdXE&5Wd#9hU0$oi)_;O=1F>7B-6Q!OjgF-8Z0VG- zl;OMz`kU|Q!>00dm9vS!>Y6zsW?%(q3MWs<8DP`1vL^sPd^(Qae%IUUn4*b#_uylQVj&PG$F+l2{P9XH{|Ay$(9GZh?tP}IHoy~ zP)0yn3k%tjs>)O(S6Pt*r!r}INM@;=aoq)zS$i}k5^!eGPDH=9B43|iq3lcPqvOZP zS4?=daVxE^{2qzo&q7?A7@1vXCR!@@g^GJEow(0j#i6cDD*F+CxYo1OPx!dbtN!Xx z$ic03<-!kJxN7~!)Q$#R*0AK9QQ~Fn@htTp8i&o1L|Qq-Rp>3}A0-Ev(6Y$9VhK~` zhYMVq+~=|dQ3RFS+k3s?wQF=hT(;Fo$!&Ot_8DV&n%Ew3Y; z4Hg)HSZlT*4;OGz?sOjY6G4R*hf%Y5)Lw#8xrj)YqhvCJJhR9Q7Dc3EJ{M9)u$JuC#$(g6!jF>Sd(K>QjaUZO9wc7UM_G*`u8X;na~i%7ML zNP}Te?SR=Lp$`(CV9*o(CpKtbqKPOD>n{fM%3w8tW?2LdS7Hfgk;V^$U^NSCa?g$i zO10!8QeSx10Rl^+6pvM4<33z)H+#0ehFGHu09~>8lzpa zk?YvN2RQ1|7eF4+M9|G)VlY|z6m>!tgu__!aoVtufc~}$+HegrtoEY~-H>5o>VJDD z+nq|sEbKrgilSqO?I2@T)Y}*nGFToSDEAfvI2BCf_k<*X)mBBL^9ZR~G@=mdh@r>0 zWd)pTujpJHhZ5a<#D0tFv#F*-Y#jE-JE7w5GT`}MIjVE*^Y+f!uy8OG=bDB^t|DJg zIIqqls_u+Ocwx{ucm-`4_cvGq%&-DLB%D79K!&3Y^1HzQ^y31qP5W&Rc3yQd#_c@_ zu;%o2%;I>1^2P61v*}-ClFdx=XNwYJ6V^ACymC z^Utv|9x~4?TL|VPYLVPuVQcf2C|ukZ3li51CCV_J?=hnjr(#ZY{_xDwEvHEL&(SM) z>P6;YMVoBkr+y{Z3qpe{Cg^`KAPR6|Pbs-O$i zi^sm%Tk)cgAwS#uB3hIUWZ7m(uN$9xa*t?4KAxF!&mvFtgN0n!-{zgCrZVHRf)!!j zMuTT!{PQZv%KcCsQ*cgss&wK}TXlIT_ocS(BR9^c^}@M|0Nc>!Nc4?uYY78cj?O)A zsH_G&)vIQkcN`o6s;uFwUKO7k^pdy`wsEM9Z_XGB0qy79uMYM|7LF)QyZGE%Di5@b z)^3xb&Lj4x+p1}1wn7(>F$Xw@x>Z_zY{g`k$$@X?ra!iTZ;av6{D-p+7{fLUzS@_l zbaagk$l`+Lf??aYhE_l0plK7|9I7z*<*otE@n>RFhBOvt)r~ff%!wWD;NL8GGJ;bT zjVE865J?hVei0@5^*6b<@pN=uECJH4&Z#UX*3`Co1H_L8oKEkUOxkmJF5EclWvst6 zw4;6rK9_IyR*1ZfW$0&e*;%i=9C3GiPjBk96=GAeSQIsUVS_oA2{LIw^8P;g-Ep6; z+_5*Up7QeE+N%KsI1PnM}_sT>jwC cF2G5X`+?us>3hQY0dx*Oat-fFxZu!#0LSHHIsgCw literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml new file mode 100644 index 0000000..cf37e2a --- /dev/null +++ b/app/src/main/res/drawable/ic_menu.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_menu_app.png b/app/src/main/res/drawable/ic_menu_app.png new file mode 100644 index 0000000000000000000000000000000000000000..dbae74f4c6ed51c0464b3e25311f0996b8f934a2 GIT binary patch literal 1750 zcmV;{1}XW8P)QmN2B0TP90sy^^S z{|KIWKvXRf1r?D5m8;4{3Pq%}Nm`OP&dtGbZRg_H6OS)5b1wTV9>(@~5~rP-Bx1dt z%R1-V>-+Xv-xgJU5qJS;;~quq5{`Ws^V8#HuFfZorWHkb-7bMSz&#A>89x88&vYr_ z7yk|@28uM0r;sxDvNH9cgr|3<`P%LjRvOLHjfVReSzmZ&cS;Xz^OHnX8_Bt^fBy#_^{d@7bjsf@hcYo&WymVv zdxB@=fdCQ_vVQG)=z6UG9E+Bj3sLM0Gcrm5T`dU6zh)jUm&P@w7Ev8+g~}6Mp_dh1X72 zm|jfom`8*8lpNSqy9v z;ecYL9#m(u;ko_{yE;8op;%ElbuE_lwt}>U+y;ZUv@^`^E+fsU>eXCO1q4Erz;A~G z-W(3J6xQ2;J>4G9_ovz1EVu-Yjz+vcxju2v2g;>shg+^t5J8+QcTQ!tQtJzq7=AMx zaCoRfDbzaZzVt|nuRoe5ZDDLS;m}aPrRh&j-PO57M`j#GYPwwML!pB(t{quKU?D^f zpAF^6*-BldtS3CVGsVGeR#DaWCL>-wS?2w#5ub#-LOIdU)ly8Z#akJyo`6}SOD;xm zktkmBmo`{rQkrPgeBGt@tA+<>nU8 z?C@3Jd9-Ha9z7FO|nV5`p$2Aepz&0mu`5jb<*$s4BwMhmX4Qu}gN z_jcO^UBVsRA1{O&+~p)80y{emJ*_4IFylo>p`UBN+!1gH_N9xV%1l|=-tN`S z&D96Vln1A-xmg=0@R!RWfkU!B8Yi$ADpQNfrRn%1y>{f_=zk&|%=>I<^`trqjC`dx z#n6=F(zHXQTJ=-cVt#cx;Jcp|wzuDDQSh$$c$rn%E`H#j?0Ba zuFWSz$;VA=SO}HYv}jkep(R~K-`Q-)TG7jenE9YuJR`!`tmEclLVH$d&l>Ei#ipz< zIp=1*9nZe}f)RP>wv%teE-+4zi!+W&4EuVlEdM0m=HYuVG96Qjs-Q%K@nXWz4adZi z6c$6}$}PuR7eje_G#t00ysnS}-MC&0u^7S!S7Rn-9lf1)Sr;7UP?$w=PuN9BO{{Uu&N0LTf$IaR2}S07*qoM6N<$f<1^(eE + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index eed4d89..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml deleted file mode 100644 index 3fc2170..0000000 --- a/app/src/main/res/layout/content_main.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 6a5a34d..2d17eba 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -1,85 +1,101 @@ - + android:fitsSystemWindows="true"> - + android:layout_height="match_parent" + tools:context=".MainActivity"> - + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> - - + - + + - + - -