From 71644d7600c725e556de6069fd1f0da2758dea50 Mon Sep 17 00:00:00 2001 From: Camilo Higuita Date: Fri, 31 Aug 2018 13:49:48 -0500 Subject: [PATCH] add launcher icons to android --- assets/buho72.png | Bin 0 -> 1346 bytes assets/buho96.png | Bin 0 -> 1785 bytes buho.pro | 3 +- buho.pro.user | 652 ++++++++++++++++++++++++++++++++++ main.qml | 4 +- mauikit | 2 +- src/views/notes/NotesView.qml | 2 +- src/widgets/CardsView.qml | 2 + 8 files changed, 661 insertions(+), 4 deletions(-) create mode 100644 assets/buho72.png create mode 100644 assets/buho96.png create mode 100644 buho.pro.user mode change 120000 => 160000 mauikit diff --git a/assets/buho72.png b/assets/buho72.png new file mode 100644 index 0000000000000000000000000000000000000000..da7fdae61d495449d32a0964243e26f92ce32e66 GIT binary patch literal 1346 zcmV-I1-<%-P)e)AW=ZPR9G}YP+AE&ZBs}|Qa|ExZI5S$g%bn<+jmBG z6W`uXnuVpg_L)y-X6~7DJz%j|EEbE!VzC&4B-wd+dHIY|YAK4M;4dk$G($KkQCa|Os@zSM;T>$!9JEUDvH8X!At}R6GB_s_U+$^4Heg_Z70e!?T7x& zof;b}-!grogyS02!n@nRzx7+9F zET2A2rCvAY#vmf(vRMw#%#25xh%n`Oc)d24Q8-Sr!YENAbGOBn=m$(hTX7+8W}`R_ z+R|nZnO%E&1^uM3Wz;TX=|)Zdy>fKe=V^N+xW8#j+pKO8MP@dPTb(+sc3XRY?TVn$ z^!erHMGil(fa92RCk?tS?)Yno#%LdXKBtJJ!OiVeBdUQtMBw<*+3{2auAAZ9(kXTt zEy6G|LY#<@RT+xYc|?BI9+#ku>SbG2nR9AF@3@jyISDeYw-VBE%q*jlh|_PZ6c42e zW>WAHG>){TIffVNZh|$%c5<5nD=h^H*4&OWjLAY<+E%57sSi4uZD`)rFA=rNsA@gn z;*T*89S7GnC+#|caP5X9I+GGLR<;{i{`g71u$=@%gxT3Kl~I{YhDRScLw%=C6q<9M zX0utQi$%Wpd`#V_Tt3f(1}?d>-Kcwjou{S1N=t#2mI5m+1v=7VfLg6a9Gf%M_$QrC z8{cp2eH=Q?9eVeSU{jshdh4nJh{9%i(s0*&kvWrqucG$Znuf!xH4?a zAZalWhhg}Q@B1(LzR$I*SGacd%IG3KK={5-qtPG?!><|erUdBy!Mz^>xP?Mty-+B; zT&-4>QVONi-;cgcAP54g)hcUiYlLCwZ*6V8Ua!}00bTlt8#GfDAPdYaE-pS>EEeAp zk-0I%eISVAc&k#WyiqQfKLe^jhZNGFmx&&5$n(4-3kwU+DWy(3j^m9sSPUGGyA3r25`_xrvDtdrVKBIZszDmiv>x01N4TQ4E^s!vFvP07*qoM6N<$ Eg1Jk3;{X5v literal 0 HcmV?d00001 diff --git a/assets/buho96.png b/assets/buho96.png new file mode 100644 index 0000000000000000000000000000000000000000..774b9df924d1746ba40e45cf4780c6da13770182 GIT binary patch literal 1785 zcmV(~4PB)aa5}>Gpc2`Z*2!sTP z3tTvI;D&@aap266%O24l5JIcfiUWw--uJeM3m;nT;+C4Wd~91P(%M_Pjng26+>B#y2B+HJJ_mTI@e?I>2c^(LYAP9mW2!bF8f*=Tj0H9_meEIU_y6d_Z zwAQub>d+z(MbYkPG`ihvHg|37uo0uSwzj^cwSFD=Cg9pOzTiZ_dr=hq_}aB=9|C5Y z!qbXT+uPgUQ%b!JcmP^!Tvyy2CW<0PqtWEYfidO>jYi{FOd)3)G3v^dD_?gU=RH8L ztgLYU{CP^H(iByk9{T-0J3BkW8 zZt;cJwkZ^fcD-Lj6g+fM`u2D2|9}Ojv-=6Ze(NU$L67U#uLIEU_g}kl! z-}mu6kF76$ZI*s7Jhl26K6l{~p65M1+`F#3NiycC0g*)vfTNVEjVlMBy1Zi5;nPHQ zCAo{x`so>Cm5gJaIbz~CK62@$)J(TPr-J9lXgr3;8ZjzMWkM>M$1$rI;e@dkW6V@H zvci;Di4iH;m}Q)-#fY4AW*H|DGe@E*vMwtp|2cD_5hKhW5tCCyOimFoIYq?e6cLkC zL`+T*F*(IrjLgT(7i%$|&bp4{^irN-1(CHFEo;eAS*zJEP_+^h$Ek}v1i*3ZPvLU% zpCd0N?JuNr;uB@U{IM1@8idE$kA-9y_N~iWi`o15U)GJD222#u`S`wddFz{zhyVBs zMZd!Gr$2+EJ?joEB7=h`?0(c_*zZ}_VI@W>#geD_xgk(7r#`ZSSVOGzNjdra2#i*MDI+QNTrl~|8h>ukoG^$ZV1m~EvD?tC2|_C ztiFV_zo#XelSZ|&WL;L0m~-WXv&%9clMQ2J?Q%{r)|bp8CZ|}72?zEGy3;}!+K-X7 znA@!;Q9QJ6c+u&F9sb$AV_n`lyWH(R=IZTtsg~BzuKi`SFy@Fe!z7}lWO9m#$tfZxr-+!GV*emHxvflPmWf_#F^_g74U@*B-IwrK ztoNG%_y28X`mb12q8M)8g}e7h>A(Dcuufvec>MNHKs-X${2gT!C7BWJ*{`Rx7E`a+ zaU7ShFN?~br%-fRt}YWrqmx}!u9TuusdD!0I{hFZitUf3i$=0+SW_;S+24O+U5|CF zX|3^npHfM7!uW4q@}lx&zCmt<=7EfAP7yIVMa1M35tCCyOimFoImKE`(37>xX&fAM zt;=Q>V~h#l*>__;c>j+KhXd<|7oG0@KG*+z6?nG!!ek7ykog8P48wcHVv!&Sh~t=c zyTvcwev^%j3lwFO(j#>D_qqMi-wDUhKu|DjS!b}4-U#+bbz2!4L+)~#Ox`#=}y zlSIx7$-LJxNz{}`BB$*8{_^_z`d12t!e<@FSvAJU(o8@pW#Tw~9ERb&R;%@gUavQa zk^>+Bh8*K2*pSHaNFv7{zk58}301@-nDHwnk=+lL(r8&W!DVszdK0<$p7Y9GD_f1VIo4 bVcz@)T2Kq(hx2^n00000NkvXXu0mjfgx_L` literal 0 HcmV?d00001 diff --git a/buho.pro b/buho.pro index 38749b4..36a2b9e 100644 --- a/buho.pro +++ b/buho.pro @@ -20,9 +20,10 @@ linux:unix:!android { } else:android { message(Building helpers for Android) - include($$PWD/3rdparty/kirigami/kirigami.pri) include($$PWD/android/android.pri) include($$PWD/android/openssl/openssl.pri) + include($$PWD/3rdparty/kirigami/kirigami.pri) + DEFINES += STATIC_KIRIGAMI } else { diff --git a/buho.pro.user b/buho.pro.user new file mode 100644 index 0000000..b68d500 --- /dev/null +++ b/buho.pro.user @@ -0,0 +1,652 @@ + + + + + + EnvironmentId + {9ec4bc40-4fd2-41e4-80ae-fee04b535e4b} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {5dd75fee-8342-4bc4-90e6-c05cd752ae29} + 0 + 0 + 0 + + /home/camilo/Coding/build-buho-Desktop-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/camilo/Coding/build-buho-Desktop-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/camilo/Coding/build-buho-Desktop-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + buho + + Qt4ProjectManager.Qt4RunConfiguration:/home/camilo/Coding/buho/buho.pro + true + + buho.pro + false + + /home/camilo/Coding/build-buho-Desktop-Debug/ + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Android for armeabi-v7a (GCC 4.9, Qt 5.11.1 (android_armv7)) + Android for armeabi-v7a (GCC 4.9, Qt 5.11.1 (android_armv7)) + {625144e9-66e3-4076-9494-b4ecaff4f4d7} + 0 + 0 + 0 + + /home/camilo/Coding/build-buho-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_android_armv7-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/camilo/Coding/build-buho-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_android_armv7-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/camilo/Coding/build-buho-Android_for_armeabi_v7a_GCC_4_9_Qt_5_11_1_android_armv7-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + + true + Copy application data + + Qt4ProjectManager.AndroidPackageInstallationStep + + + android-27 + + true + Build Android APK + + QmakeProjectManager.AndroidBuildApkStep + false + false + + 4 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + + true + Deploy to Android device + + Qt4ProjectManager.AndroidDeployQtStep + false + + 1 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy to Android device + + Qt4ProjectManager.AndroidDeployConfiguration2 + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + + + + buho + buho + Qt4ProjectManager.AndroidRunConfiguration:/home/camilo/Coding/buho/buho.pro + buho.pro + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/main.qml b/main.qml index 29f8fbd..c8dd298 100644 --- a/main.qml +++ b/main.qml @@ -14,6 +14,7 @@ Maui.ApplicationWindow title: qsTr("Buho") /***** PROPS *****/ + altToolBars: true floatingBar: true footBarOverlap: true allowRiseContent: false @@ -126,7 +127,7 @@ Maui.ApplicationWindow /***** VIEWS *****/ - SwipeView + SwipeView { id: swipeView anchors.fill: parent @@ -134,6 +135,7 @@ Maui.ApplicationWindow onCurrentIndexChanged: currentView = currentIndex interactive: isMobile + NotesView { id: notesView diff --git a/mauikit b/mauikit deleted file mode 120000 index 4ea8073..0000000 --- a/mauikit +++ /dev/null @@ -1 +0,0 @@ -/home/camilo/Coding/qml/mauikit \ No newline at end of file diff --git a/mauikit b/mauikit new file mode 160000 index 0000000..49aeaa2 --- /dev/null +++ b/mauikit @@ -0,0 +1 @@ +Subproject commit 49aeaa274206bea6b8438f75ae5efa2b14d88fa7 diff --git a/src/views/notes/NotesView.qml b/src/views/notes/NotesView.qml index 6f15364..8a0fcc0 100644 --- a/src/views/notes/NotesView.qml +++ b/src/views/notes/NotesView.qml @@ -97,7 +97,7 @@ Maui.Page Layout.margins: isMobile ? space.big : space.enormous onItemClicked: noteClicked(cardsView.model.get(index)) holder.emoji: "qrc:/Type.png" - holder.emojiSize: iconSizes.huge + holder.emojiSize: 500 holder.isMask: false holder.title : "No notes!" holder.body: "Click here to create a new note" diff --git a/src/widgets/CardsView.qml b/src/widgets/CardsView.qml index 16ce65b..f53183e 100644 --- a/src/widgets/CardsView.qml +++ b/src/widgets/CardsView.qml @@ -26,8 +26,10 @@ GridView { id: holder visible: count < 1 + z: 999 } + CardMenu { id: cardMenu -- GitLab