Commit 85ae1c63 authored by Camilo higuita's avatar Camilo higuita

update footbar

parent 49e34e92
......@@ -3,3 +3,5 @@ QT += androidextras webview
RESOURCES += \
$$PWD/android.qrc \
$$PWD/../icons.qrc
#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/
<?xml version="1.0"?>
<manifest package="org.qtproject.pix" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
<manifest package="org.kde.pix" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Pix" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="Pix" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
......
android/res/drawable-ldpi/icon.png

1.07 KB | W: | H:

android/res/drawable-ldpi/icon.png

1.07 KB | W: | H:

android/res/drawable-ldpi/icon.png
android/res/drawable-ldpi/icon.png
android/res/drawable-ldpi/icon.png
android/res/drawable-ldpi/icon.png
  • 2-up
  • Swipe
  • Onion skin
assets/pix.png

1.07 KB | W: | H:

assets/pix.png

1.07 KB | W: | H:

assets/pix.png
assets/pix.png
assets/pix.png
assets/pix.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
......@@ -46,9 +46,11 @@ QStringList getFolderImages(const QString &path)
if (QFileInfo(path).isDir())
{
QDirIterator it(path, PIX::formats, QDir::Files, QDirIterator::Subdirectories);
while (it.hasNext()) urls<<it.next();
while (it.hasNext())
urls << it.next();
} else if (QFileInfo(path).isFile()) urls<<path;
}else if (QFileInfo(path).isFile())
urls << path;
return urls;
}
......@@ -67,8 +69,6 @@ QStringList openFiles(const QStringList &files)
urls.insert(0, QString(files.first()));
}
qDebug()<<"TRYING TO OPEN FILES<<" << urls;
return urls;
}
......@@ -105,7 +105,6 @@ int main(int argc, char *argv[])
QQmlApplicationEngine engine;
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, [&]()
{
qDebug()<<"FINISHED LOADING QML APP";
pix.refreshCollection();
if(!pics.isEmpty())
pix.openPics(pics);
......
pix.png

1.07 KB | W: | H:

pix.png

1.07 KB | W: | H:

pix.png
pix.png
pix.png
pix.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -67,3 +67,12 @@ HEADERS += \
src/utils/pic.h
include(install.pri)
DISTFILES += \
android/AndroidManifest.xml \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradlew \
android/res/values/libs.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew.bat
......@@ -48,7 +48,6 @@ Maui.ApplicationWindow
id: root
title: qsTr("Pix")
floatingBar: true
// visibility: fullScreen ? ApplicationWindow.FullScreen : ApplicationWindow.Windowed
// altToolBars: true
......@@ -100,32 +99,6 @@ Maui.ApplicationWindow
headBar.middleContent: PixsBar {}
footBar.leftContent: Maui.ToolButton
{
iconName: "document-share"
iconColor: altColorText
onClicked: isAndroid ? Maui.Android.shareDialog(pixViewer.currentPic.url) :
shareDialog.show(pixViewer.currentPic.url)
}
footBar.middleContent: PixFooter
{
id: pixFooter
}
footBar.rightContent : Maui.ToolButton
{
iconName: fullScreen? "window-close" : "view-fullscreen"
iconColor: altColorText
onClicked: fullScreen = !fullScreen
}
footBar.visible: !pixViewer.holder.visible && currentView === views.viewer
ColumnLayout
{
......@@ -237,4 +210,10 @@ Maui.ApplicationWindow
target: tag
onTagged: tagsView.populate()
}
Component.onCompleted:
{
if(isAndroid)
switchColorScheme(colorScheme.Dark)
}
}
......@@ -5,6 +5,7 @@ import "../../../view_models"
import "../../../widgets/views/Viewer/Viewer.js" as VIEWER
import "../../../widgets/views/Pix.js" as PIX
import "../../../db/Query.js" as Q
import "../.."
import org.kde.maui 1.0 as Maui
......@@ -25,10 +26,17 @@ Maui.Page
property string viewerForegroundColor : pix.loadSettings("VIEWER_FG_COLOR", "PIX", textColor)
margins: 0
floatingBar: true
headBarTitle: currentPic.title || ""
headBarExit: false
headBarVisible: !holder.visible && !fullScreen
background: Rectangle
{
color: viewerBackgroundColor
}
headBar.rightContent: [
Maui.ToolButton
......@@ -52,6 +60,28 @@ Maui.Page
onClicked: albumsDialog.show(currentPic.url)
}
footBar.leftContent: Maui.ToolButton
{
iconName: "document-share"
iconColor: altColorText
onClicked: isAndroid ? Maui.Android.shareDialog(pixViewer.currentPic.url) :
shareDialog.show(pixViewer.currentPic.url)
}
footBar.middleContent: PixFooter
{
id: pixFooter
}
footBar.rightContent : Maui.ToolButton
{
iconName: fullScreen? "window-close" : "view-fullscreen"
iconColor: altColorText
onClicked: fullScreen = !fullScreen
}
Connections
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment