mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Start new Material Design android GUI
This commit is contained in:
parent
6cef2a9349
commit
c0c04d1575
10
android.qrc
Normal file
10
android.qrc
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
<RCC>
|
||||||
|
<qresource prefix="/">
|
||||||
|
<file>img/android/search.png</file>
|
||||||
|
<file>img/android/menu.png</file>
|
||||||
|
<file>res/android/Roboto-Bold.ttf</file>
|
||||||
|
<file>res/android/Roboto-Light.ttf</file>
|
||||||
|
<file>res/android/Roboto-Regular.ttf</file>
|
||||||
|
<file>res/android/Roboto-Thin.ttf</file>
|
||||||
|
</qresource>
|
||||||
|
</RCC>
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<manifest package="im.tox.qtox" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
|
<manifest package="im.tox.qtox" 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="qtox">
|
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="qtox">
|
||||||
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="qTox" android:screenOrientation="unspecified" android:launchMode="singleTop">
|
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="qTox" android:screenOrientation="unspecified" android:launchMode="singleTop">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
|
|
51
android/build.gradle
Normal file
51
android/build.gradle
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
classpath 'com.android.tools.build:gradle:0.12.1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
apply plugin: 'android'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
/*******************************************************
|
||||||
|
* The following variables:
|
||||||
|
* - androidBuildToolsVersion,
|
||||||
|
* - androidCompileSdkVersion
|
||||||
|
* - qt5AndroidDir - holds the path to qt android files
|
||||||
|
* needed to build any Qt application
|
||||||
|
* on Android.
|
||||||
|
*
|
||||||
|
* are defined in gradle.properties file. This file is
|
||||||
|
* updated by QtCreator and androiddeployqt tools.
|
||||||
|
* Changing them manually might break the compilation!
|
||||||
|
*******************************************************/
|
||||||
|
|
||||||
|
compileSdkVersion androidCompileSdkVersion.toInteger()
|
||||||
|
|
||||||
|
buildToolsVersion androidBuildToolsVersion
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
|
java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
|
||||||
|
aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
|
||||||
|
res.srcDirs = [qt5AndroidDir + '/res', 'res']
|
||||||
|
resources.srcDirs = ['src']
|
||||||
|
renderscript.srcDirs = ['src']
|
||||||
|
assets.srcDirs = ['assets']
|
||||||
|
jniLibs.srcDirs = ['libs']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lintOptions {
|
||||||
|
abortOnError false
|
||||||
|
}
|
||||||
|
}
|
9
android/gradle.properties
Normal file
9
android/gradle.properties
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
## This file is automatically generated by QtCreator.
|
||||||
|
#
|
||||||
|
# This file must *NOT* be checked into Version Control Systems,
|
||||||
|
# as it contains information specific to your local configuration.
|
||||||
|
|
||||||
|
androidBuildToolsVersion=21.1.2
|
||||||
|
androidCompileSdkVersion=20
|
||||||
|
buildDir=.build
|
||||||
|
qt5AndroidDir=/opt/qt/5.4/android_armv5/src/android/java
|
BIN
android/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
android/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
android/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
android/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
#Wed Apr 10 15:27:10 PDT 2013
|
||||||
|
distributionBase=GRADLE_USER_HOME
|
||||||
|
distributionPath=wrapper/dists
|
||||||
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
|
164
android/gradlew
vendored
Executable file
164
android/gradlew
vendored
Executable file
|
@ -0,0 +1,164 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
##############################################################################
|
||||||
|
##
|
||||||
|
## Gradle start up script for UN*X
|
||||||
|
##
|
||||||
|
##############################################################################
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS=""
|
||||||
|
|
||||||
|
APP_NAME="Gradle"
|
||||||
|
APP_BASE_NAME=`basename "$0"`
|
||||||
|
|
||||||
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
|
MAX_FD="maximum"
|
||||||
|
|
||||||
|
warn ( ) {
|
||||||
|
echo "$*"
|
||||||
|
}
|
||||||
|
|
||||||
|
die ( ) {
|
||||||
|
echo
|
||||||
|
echo "$*"
|
||||||
|
echo
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# OS specific support (must be 'true' or 'false').
|
||||||
|
cygwin=false
|
||||||
|
msys=false
|
||||||
|
darwin=false
|
||||||
|
case "`uname`" in
|
||||||
|
CYGWIN* )
|
||||||
|
cygwin=true
|
||||||
|
;;
|
||||||
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# For Cygwin, ensure paths are in UNIX format before anything is touched.
|
||||||
|
if $cygwin ; then
|
||||||
|
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Attempt to set APP_HOME
|
||||||
|
# Resolve links: $0 may be a link
|
||||||
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
|
while [ -h "$PRG" ] ; do
|
||||||
|
ls=`ls -ld "$PRG"`
|
||||||
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
|
PRG="$link"
|
||||||
|
else
|
||||||
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >&-
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >&-
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
# Determine the Java command to use to start the JVM.
|
||||||
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
|
else
|
||||||
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
|
fi
|
||||||
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
JAVACMD="java"
|
||||||
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
location of your Java installation."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Increase the maximum file descriptors if we can.
|
||||||
|
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||||
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
|
if [ $? -eq 0 ] ; then
|
||||||
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
ulimit -n $MAX_FD
|
||||||
|
if [ $? -ne 0 ] ; then
|
||||||
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
|
if $darwin; then
|
||||||
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
|
if $cygwin ; then
|
||||||
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
|
||||||
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
|
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||||
|
SEP=""
|
||||||
|
for dir in $ROOTDIRSRAW ; do
|
||||||
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
|
SEP="|"
|
||||||
|
done
|
||||||
|
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||||
|
# Add a user-defined pattern to the cygpath arguments
|
||||||
|
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||||
|
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||||
|
fi
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
i=0
|
||||||
|
for arg in "$@" ; do
|
||||||
|
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||||
|
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||||
|
|
||||||
|
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||||
|
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||||
|
else
|
||||||
|
eval `echo args$i`="\"$arg\""
|
||||||
|
fi
|
||||||
|
i=$((i+1))
|
||||||
|
done
|
||||||
|
case $i in
|
||||||
|
(0) set -- ;;
|
||||||
|
(1) set -- "$args0" ;;
|
||||||
|
(2) set -- "$args0" "$args1" ;;
|
||||||
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||||
|
function splitJvmOpts() {
|
||||||
|
JVM_OPTS=("$@")
|
||||||
|
}
|
||||||
|
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||||
|
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||||
|
|
||||||
|
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
90
android/gradlew.bat
vendored
Normal file
90
android/gradlew.bat
vendored
Normal file
|
@ -0,0 +1,90 @@
|
||||||
|
@if "%DEBUG%" == "" @echo off
|
||||||
|
@rem ##########################################################################
|
||||||
|
@rem
|
||||||
|
@rem Gradle startup script for Windows
|
||||||
|
@rem
|
||||||
|
@rem ##########################################################################
|
||||||
|
|
||||||
|
@rem Set local scope for the variables with windows NT shell
|
||||||
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
set DEFAULT_JVM_OPTS=
|
||||||
|
|
||||||
|
set DIRNAME=%~dp0
|
||||||
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
|
set APP_BASE_NAME=%~n0
|
||||||
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Find java.exe
|
||||||
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
|
set JAVA_EXE=java.exe
|
||||||
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:findJavaFromJavaHome
|
||||||
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
echo.
|
||||||
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
echo location of your Java installation.
|
||||||
|
|
||||||
|
goto fail
|
||||||
|
|
||||||
|
:init
|
||||||
|
@rem Get command-line arguments, handling Windowz variants
|
||||||
|
|
||||||
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||||
|
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||||
|
|
||||||
|
:win9xME_args
|
||||||
|
@rem Slurp the command line arguments.
|
||||||
|
set CMD_LINE_ARGS=
|
||||||
|
set _SKIP=2
|
||||||
|
|
||||||
|
:win9xME_args_slurp
|
||||||
|
if "x%~1" == "x" goto execute
|
||||||
|
|
||||||
|
set CMD_LINE_ARGS=%*
|
||||||
|
goto execute
|
||||||
|
|
||||||
|
:4NT_args
|
||||||
|
@rem Get arguments from the 4NT Shell from JP Software
|
||||||
|
set CMD_LINE_ARGS=%$
|
||||||
|
|
||||||
|
:execute
|
||||||
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
@rem Execute Gradle
|
||||||
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
|
:end
|
||||||
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
|
:fail
|
||||||
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
|
rem the _cmd.exe /c_ return code!
|
||||||
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:mainEnd
|
||||||
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
|
:omega
|
6
android/local.properties
Normal file
6
android/local.properties
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
## This file is automatically generated by QtCreator.
|
||||||
|
#
|
||||||
|
# This file must *NOT* be checked into Version Control Systems,
|
||||||
|
# as it contains information specific to your local configuration.
|
||||||
|
|
||||||
|
sdk.dir=/opt/android/android-sdk-linux
|
25
android/res/values/libs.xml
Normal file
25
android/res/values/libs.xml
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
|
<resources>
|
||||||
|
<array name="qt_sources">
|
||||||
|
<item>https://download.qt-project.org/ministro/android/qt5/qt-5.4</item>
|
||||||
|
</array>
|
||||||
|
|
||||||
|
<!-- The following is handled automatically by the deployment tool. It should
|
||||||
|
not be edited manually. -->
|
||||||
|
|
||||||
|
<array name="bundled_libs">
|
||||||
|
<!-- %%INSERT_EXTRA_LIBS%% -->
|
||||||
|
</array>
|
||||||
|
|
||||||
|
<array name="qt_libs">
|
||||||
|
<!-- %%INSERT_QT_LIBS%% -->
|
||||||
|
</array>
|
||||||
|
|
||||||
|
<array name="bundled_in_lib">
|
||||||
|
<!-- %%INSERT_BUNDLED_IN_LIB%% -->
|
||||||
|
</array>
|
||||||
|
<array name="bundled_in_assets">
|
||||||
|
<!-- %%INSERT_BUNDLED_IN_ASSETS%% -->
|
||||||
|
</array>
|
||||||
|
|
||||||
|
</resources>
|
BIN
img/android/menu.png
Normal file
BIN
img/android/menu.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 207 B |
BIN
img/android/search.png
Normal file
BIN
img/android/search.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
10
qtox.pro
10
qtox.pro
|
@ -120,6 +120,7 @@ android {
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RESOURCES += android.qrc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -378,3 +379,12 @@ contains(DEFINES, QTOX_PLATFORM_EXT) {
|
||||||
src/platform/autorun_xdg.cpp \
|
src/platform/autorun_xdg.cpp \
|
||||||
src/platform/autorun_osx.cpp
|
src/platform/autorun_osx.cpp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
DISTFILES += \
|
||||||
|
android/gradle/wrapper/gradle-wrapper.jar \
|
||||||
|
android/AndroidManifest.xml \
|
||||||
|
android/gradlew.bat \
|
||||||
|
android/res/values/libs.xml \
|
||||||
|
android/build.gradle \
|
||||||
|
android/gradle/wrapper/gradle-wrapper.properties \
|
||||||
|
android/gradlew
|
||||||
|
|
BIN
res/android/Roboto-Bold.ttf
Normal file
BIN
res/android/Roboto-Bold.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-BoldItalic.ttf
Normal file
BIN
res/android/Roboto-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-Italic.ttf
Normal file
BIN
res/android/Roboto-Italic.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-Light.ttf
Normal file
BIN
res/android/Roboto-Light.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-LightItalic.ttf
Normal file
BIN
res/android/Roboto-LightItalic.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-Regular.ttf
Normal file
BIN
res/android/Roboto-Regular.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-Thin.ttf
Normal file
BIN
res/android/Roboto-Thin.ttf
Normal file
Binary file not shown.
BIN
res/android/Roboto-ThinItalic.ttf
Normal file
BIN
res/android/Roboto-ThinItalic.ttf
Normal file
Binary file not shown.
BIN
res/android/RobotoCondensed-Bold.ttf
Normal file
BIN
res/android/RobotoCondensed-Bold.ttf
Normal file
Binary file not shown.
BIN
res/android/RobotoCondensed-BoldItalic.ttf
Normal file
BIN
res/android/RobotoCondensed-BoldItalic.ttf
Normal file
Binary file not shown.
BIN
res/android/RobotoCondensed-Italic.ttf
Normal file
BIN
res/android/RobotoCondensed-Italic.ttf
Normal file
Binary file not shown.
BIN
res/android/RobotoCondensed-Light.ttf
Normal file
BIN
res/android/RobotoCondensed-Light.ttf
Normal file
Binary file not shown.
BIN
res/android/RobotoCondensed-LightItalic.ttf
Normal file
BIN
res/android/RobotoCondensed-LightItalic.ttf
Normal file
Binary file not shown.
BIN
res/android/RobotoCondensed-Regular.ttf
Normal file
BIN
res/android/RobotoCondensed-Regular.ttf
Normal file
Binary file not shown.
1202
src/android.ui
1202
src/android.ui
File diff suppressed because it is too large
Load Diff
|
@ -16,6 +16,8 @@
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QMenu>
|
#include <QMenu>
|
||||||
|
#include <QFontDatabase>
|
||||||
|
#include <QFont>
|
||||||
|
|
||||||
AndroidGUI::AndroidGUI(QWidget *parent) :
|
AndroidGUI::AndroidGUI(QWidget *parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
|
@ -23,79 +25,31 @@ AndroidGUI::AndroidGUI(QWidget *parent) :
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
ui->friendList->setStyleSheet(Style::resolve(Style::getStylesheet(":ui/friendList/friendList.css")));
|
QFontDatabase::addApplicationFont(":/res/android/Roboto-Bold.ttf");
|
||||||
|
QFont font("Roboto1200310", 24);
|
||||||
|
qDebug() << "Font: "<<font.family();
|
||||||
|
ui->headTitle->setFont(font);
|
||||||
|
|
||||||
profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png");
|
Q_INIT_RESOURCE(android);
|
||||||
profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
|
|
||||||
profilePicture->setClickable(true);
|
|
||||||
ui->myProfile->insertWidget(0, profilePicture);
|
|
||||||
ui->myProfile->insertSpacing(1, 7);
|
|
||||||
|
|
||||||
ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}"));
|
|
||||||
ui->statusHead->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
|
|
||||||
|
|
||||||
contactListWidget = new FriendListWidget();
|
|
||||||
ui->friendList->setWidget(contactListWidget);
|
|
||||||
ui->friendList->setLayoutDirection(Qt::RightToLeft);
|
|
||||||
|
|
||||||
ui->nameLabel->setEditable(true);
|
|
||||||
ui->statusLabel->setEditable(true);
|
|
||||||
|
|
||||||
ui->statusPanel->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
|
|
||||||
|
|
||||||
QMenu *statusButtonMenu = new QMenu(ui->statusButton);
|
|
||||||
QAction* setStatusOnline = statusButtonMenu->addAction(AndroidGUI::tr("Online","Button to set your status to 'Online'"));
|
|
||||||
setStatusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png"));
|
|
||||||
QAction* setStatusAway = statusButtonMenu->addAction(AndroidGUI::tr("Away","Button to set your status to 'Away'"));
|
|
||||||
setStatusAway->setIcon(QIcon(":ui/statusButton/dot_idle.png"));
|
|
||||||
QAction* setStatusBusy = statusButtonMenu->addAction(AndroidGUI::tr("Busy","Button to set your status to 'Busy'"));
|
|
||||||
setStatusBusy->setIcon(QIcon(":ui/statusButton/dot_busy.png"));
|
|
||||||
ui->statusButton->setMenu(statusButtonMenu);
|
|
||||||
|
|
||||||
ui->statusButton->setProperty("status", "offline");
|
|
||||||
Style::repolish(ui->statusButton);
|
|
||||||
|
|
||||||
// Disable some widgets until we're connected to the DHT
|
|
||||||
ui->statusButton->setEnabled(false);
|
|
||||||
|
|
||||||
Style::setThemeColor(Settings::getInstance().getThemeColor());
|
|
||||||
Style::setThemeColor(1);
|
|
||||||
reloadTheme();
|
|
||||||
|
|
||||||
connect(ui->nameLabel, &CroppingLabel::textChanged, this, &AndroidGUI::onUsernameChanged);
|
|
||||||
connect(ui->statusLabel, &CroppingLabel::textChanged, this, &AndroidGUI::onStatusMessageChanged);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AndroidGUI::~AndroidGUI()
|
AndroidGUI::~AndroidGUI()
|
||||||
{
|
{
|
||||||
delete profilePicture;
|
|
||||||
delete contactListWidget;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidGUI::reloadTheme()
|
void AndroidGUI::reloadTheme()
|
||||||
{
|
{
|
||||||
QString statusPanelStyle = Style::getStylesheet(":/ui/window/statusPanel.css");
|
|
||||||
ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}"));
|
|
||||||
ui->statusPanel->setStyleSheet(statusPanelStyle);
|
|
||||||
ui->statusHead->setStyleSheet(statusPanelStyle);
|
|
||||||
ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css"));
|
|
||||||
ui->statusButton->setStyleSheet(Style::getStylesheet(":ui/statusButton/statusButton.css"));
|
|
||||||
|
|
||||||
for (Friend* f : FriendList::getAllFriends())
|
|
||||||
f->getFriendWidget()->reloadTheme();
|
|
||||||
|
|
||||||
for (Group* g : GroupList::getAllGroups())
|
|
||||||
g->getGroupWidget()->reloadTheme();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidGUI::onSelfAvatarLoaded(const QPixmap& pic)
|
void AndroidGUI::onSelfAvatarLoaded(const QPixmap& pic)
|
||||||
{
|
{
|
||||||
profilePicture->setPixmap(pic);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidGUI::onConnected()
|
void AndroidGUI::onConnected()
|
||||||
{
|
{
|
||||||
ui->statusButton->setEnabled(true);
|
|
||||||
if (beforeDisconnect == Status::Offline)
|
if (beforeDisconnect == Status::Offline)
|
||||||
emit statusSet(Status::Online);
|
emit statusSet(Status::Online);
|
||||||
else
|
else
|
||||||
|
@ -104,17 +58,6 @@ void AndroidGUI::onConnected()
|
||||||
|
|
||||||
void AndroidGUI::onDisconnected()
|
void AndroidGUI::onDisconnected()
|
||||||
{
|
{
|
||||||
QString stat = ui->statusButton->property("status").toString();
|
|
||||||
if (stat == "online")
|
|
||||||
beforeDisconnect = Status::Online;
|
|
||||||
else if (stat == "busy")
|
|
||||||
beforeDisconnect = Status::Busy;
|
|
||||||
else if (stat == "away")
|
|
||||||
beforeDisconnect = Status::Away;
|
|
||||||
else
|
|
||||||
beforeDisconnect = Status::Offline;
|
|
||||||
|
|
||||||
ui->statusButton->setEnabled(false);
|
|
||||||
emit statusSet(Status::Offline);
|
emit statusSet(Status::Offline);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,8 +69,6 @@ void AndroidGUI::onUsernameChanged(const QString& newUsername, const QString& ol
|
||||||
|
|
||||||
void AndroidGUI::setUsername(const QString& username)
|
void AndroidGUI::setUsername(const QString& username)
|
||||||
{
|
{
|
||||||
ui->nameLabel->setText(username);
|
|
||||||
ui->nameLabel->setToolTip(username); // for overlength names
|
|
||||||
QString sanename = username;
|
QString sanename = username;
|
||||||
sanename.remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]"));
|
sanename.remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]"));
|
||||||
nameMention = QRegExp("\\b" + QRegExp::escape(username) + "\\b", Qt::CaseInsensitive);
|
nameMention = QRegExp("\\b" + QRegExp::escape(username) + "\\b", Qt::CaseInsensitive);
|
||||||
|
@ -136,37 +77,17 @@ void AndroidGUI::setUsername(const QString& username)
|
||||||
|
|
||||||
void AndroidGUI::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
|
void AndroidGUI::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage)
|
||||||
{
|
{
|
||||||
ui->statusLabel->setText(oldStatusMessage); // restore old status message until Core tells us to set it
|
|
||||||
ui->statusLabel->setToolTip(oldStatusMessage); // for overlength messsages
|
|
||||||
Nexus::getCore()->setStatusMessage(newStatusMessage);
|
Nexus::getCore()->setStatusMessage(newStatusMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidGUI::setStatusMessage(const QString &statusMessage)
|
void AndroidGUI::setStatusMessage(const QString &statusMessage)
|
||||||
{
|
{
|
||||||
ui->statusLabel->setText(statusMessage);
|
|
||||||
ui->statusLabel->setToolTip(statusMessage); // for overlength messsages
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidGUI::onStatusSet(Status status)
|
void AndroidGUI::onStatusSet(Status status)
|
||||||
{
|
{
|
||||||
//We have to use stylesheets here, there's no way to
|
|
||||||
//prevent the button icon from moving when pressed otherwise
|
|
||||||
switch (status)
|
|
||||||
{
|
|
||||||
case Status::Online:
|
|
||||||
ui->statusButton->setProperty("status" ,"online");
|
|
||||||
break;
|
|
||||||
case Status::Away:
|
|
||||||
ui->statusButton->setProperty("status" ,"away");
|
|
||||||
break;
|
|
||||||
case Status::Busy:
|
|
||||||
ui->statusButton->setProperty("status" ,"busy");
|
|
||||||
break;
|
|
||||||
case Status::Offline:
|
|
||||||
ui->statusButton->setProperty("status" ,"offline");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Style::repolish(ui->statusButton);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void AndroidGUI::keyPressEvent(QKeyEvent* event)
|
void AndroidGUI::keyPressEvent(QKeyEvent* event)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user