Skip to content

Commit

Permalink
Update icons and network request
Browse files Browse the repository at this point in the history
  • Loading branch information
@Iktwo
Iktwo committed Dec 23, 2015
1 parent 68a7f30 commit 8cebf1f
Show file tree
Hide file tree
Showing 96 changed files with 65 additions and 388 deletions.
4 changes: 2 additions & 2 deletions android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<manifest package="com.iktwo.musicgear" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.9.9" android:versionCode="23" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Musicgear" android:icon="@drawable/icon" android:theme="@style/AppTheme">
<manifest package="com.iktwo.musicgear" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.9.10" android:versionCode="24" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Musicgear" android:icon="@mipmap/ic_launcher" android:theme="@style/AppTheme">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="com.iktwo.musicgear.MusicGear" android:label="Musicgear" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
Expand Down
Binary file removed android/res/drawable-hdpi/icon.png
View file
Binary file not shown.
Binary file removed android/res/drawable-ldpi/icon.png
View file
Binary file not shown.
Binary file removed android/res/drawable-mdpi/icon.png
View file
Binary file not shown.
Binary file removed android/res/drawable-xhdpi/icon.png
View file
Binary file not shown.
Binary file removed android/res/drawable-xxhdpi/icon.png
View file
Binary file not shown.
Binary file removed android/res/drawable-xxxhdpi/icon.png
View file
Binary file not shown.
Binary file added android/res/mipmap-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/res/mipmap-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/res/mipmap-xhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/res/mipmap-xxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/res/mipmap-xxxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 3 additions & 6 deletions qml/SearchPage.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,14 @@ Page {
style: BusyIndicatorStyle {
indicator: Image {
id: busyIndicator

visible: control.running
height: control.height
width: control.width

source: "qrc:/images/" + Theme.getBestIconSize(height) + "busy_dark"
antialiasing: true

RotationAnimator {
target: busyIndicator
running: control.running
Expand All @@ -173,12 +176,6 @@ Page {
model: musicStreamer
clip: true

highlight: Rectangle {
height: 100
width: 100
color: "#343498db"
}

footer: busyFooter
delegate: SongDelegate {
Keys.onEnterPressed: addToPlaylist()
Expand Down
6 changes: 0 additions & 6 deletions qml/main.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ ApplicationWindow {
FontLoader { source: "qrc:/fonts/Roboto-BlackItalic" }
FontLoader { source: "qrc:/fonts/Roboto-Bold" }
FontLoader { source: "qrc:/fonts/Roboto-BoldItalic" }
FontLoader { source: "qrc:/fonts/RobotoCondensed-Bold" }
FontLoader { source: "qrc:/fonts/RobotoCondensed-BoldItalic" }
FontLoader { source: "qrc:/fonts/RobotoCondensed-Italic" }
FontLoader { source: "qrc:/fonts/RobotoCondensed-Light" }
FontLoader { source: "qrc:/fonts/RobotoCondensed-LightItalic" }
FontLoader { source: "qrc:/fonts/RobotoCondensed-Regular" }
FontLoader { source: "qrc:/fonts/Roboto-Italic" }
FontLoader { source: "qrc:/fonts/Roboto-Light" }
FontLoader { source: "qrc:/fonts/Roboto-LightItalic" }
Expand Down
92 changes: 35 additions & 57 deletions resources.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,128 +19,106 @@
<file>qml/ReviewDialog.qml</file>
</qresource>
<qresource prefix="/images">
<file alias="search">resources/images/search.svg</file>
<file alias="search">resources/images/ic_search_white_48dp.svg</file>
<file alias="remove">resources/images/remove.svg</file>
<file alias="download">resources/images/download.svg</file>
<file alias="add_to_playlist">resources/images/add_to_playlist.svg</file>
<file alias="download">resources/images/ic_file_download_black_48dp.svg</file>
<file alias="add_to_playlist">resources/images/ic_playlist_add_black_48dp.svg</file>
<file alias="previous">resources/images/previous.svg</file>
<file alias="play">resources/images/play.svg</file>
<file alias="pause">resources/images/pause.svg</file>
<file alias="next">resources/images/next.svg</file>
<file alias="back">resources/images/back.svg</file>
<file alias="back">resources/images/ic_arrow_back_white_48dp.svg</file>
<file alias="settings">resources/images/settings.svg</file>
<file alias="busy">resources/images/busy.svg</file>
<file alias="busy_dark">resources/images/busy_dark.svg</file>
<file alias="help">resources/images/help.svg</file>
<file alias="help">resources/images/ic_help_outline_white_48dp.svg</file>
<file alias="icon">resources/images/icon.svg</file>
</qresource>
<qresource prefix="/images/ldpi">
<file alias="icon">android/res/drawable-ldpi/icon.png</file>
<file alias="back">resources/images/drawable-ldpi/back.png</file>
<file alias="busy">resources/images/drawable-ldpi/busy.png</file>
<file alias="busy_dark">resources/images/drawable-ldpi/busy_dark.png</file>
<file alias="help">resources/images/drawable-ldpi/help.png</file>
<file alias="play">resources/images/drawable-ldpi/play.png</file>
<file alias="next">resources/images/drawable-ldpi/next.png</file>
<file alias="pause">resources/images/drawable-ldpi/pause.png</file>
<file alias="remove">resources/images/drawable-ldpi/remove.png</file>
<file alias="search">resources/images/drawable-ldpi/search.png</file>
<file alias="previous">resources/images/drawable-ldpi/previous.png</file>
<file alias="download">resources/images/drawable-ldpi/download.png</file>
<file alias="settings">resources/images/drawable-ldpi/settings.png</file>
<file alias="add_to_playlist">resources/images/drawable-ldpi/add_to_playlist.png</file>
</qresource>
<qresource prefix="/images/mdpi">
<file alias="icon">android/res/drawable-mdpi/icon.png</file>
<file alias="back">resources/images/drawable-mdpi/back.png</file>
<file alias="icon">android/res/mipmap-mdpi/ic_launcher.png</file>
<file alias="back">resources/images/drawable-mdpi/ic_arrow_back_white_48dp.png</file>
<file alias="busy">resources/images/drawable-mdpi/busy.png</file>
<file alias="busy_dark">resources/images/drawable-mdpi/busy_dark.png</file>
<file alias="help">resources/images/drawable-mdpi/help.png</file>
<file alias="help">resources/images/drawable-mdpi/ic_help_outline_white_48dp.png</file>
<file alias="play">resources/images/drawable-mdpi/play.png</file>
<file alias="next">resources/images/drawable-mdpi/next.png</file>
<file alias="pause">resources/images/drawable-mdpi/pause.png</file>
<file alias="remove">resources/images/drawable-mdpi/remove.png</file>
<file alias="search">resources/images/drawable-mdpi/search.png</file>
<file alias="search">resources/images/drawable-mdpi/ic_search_white_48dp.png</file>
<file alias="previous">resources/images/drawable-mdpi/previous.png</file>
<file alias="download">resources/images/drawable-mdpi/download.png</file>
<file alias="download">resources/images/drawable-mdpi/ic_file_download_black_48dp.png</file>
<file alias="settings">resources/images/drawable-mdpi/settings.png</file>
<file alias="add_to_playlist">resources/images/drawable-mdpi/add_to_playlist.png</file>
<file alias="add_to_playlist">resources/images/drawable-mdpi/ic_playlist_add_black_48dp.png</file>
</qresource>
<qresource prefix="/images/hdpi">
<file alias="icon">android/res/drawable-hdpi/icon.png</file>
<file alias="back">resources/images/drawable-hdpi/back.png</file>
<file alias="icon">android/res/mipmap-hdpi/ic_launcher.png</file>
<file alias="back">resources/images/drawable-hdpi/ic_arrow_back_white_48dp.png</file>
<file alias="busy">resources/images/drawable-hdpi/busy.png</file>
<file alias="busy_dark">resources/images/drawable-hdpi/busy_dark.png</file>
<file alias="help">resources/images/drawable-hdpi/help.png</file>
<file alias="help">resources/images/drawable-hdpi/ic_help_outline_white_48dp.png</file>
<file alias="play">resources/images/drawable-hdpi/play.png</file>
<file alias="next">resources/images/drawable-hdpi/next.png</file>
<file alias="pause">resources/images/drawable-hdpi/pause.png</file>
<file alias="remove">resources/images/drawable-hdpi/remove.png</file>
<file alias="search">resources/images/drawable-hdpi/search.png</file>
<file alias="search">resources/images/drawable-hdpi/ic_search_white_48dp.png</file>
<file alias="previous">resources/images/drawable-hdpi/previous.png</file>
<file alias="download">resources/images/drawable-hdpi/download.png</file>
<file alias="download">resources/images/drawable-hdpi/ic_file_download_black_48dp.png</file>
<file alias="settings">resources/images/drawable-hdpi/settings.png</file>
<file alias="add_to_playlist">resources/images/drawable-hdpi/add_to_playlist.png</file>
<file alias="add_to_playlist">resources/images/drawable-hdpi/ic_playlist_add_black_48dp.png</file>
</qresource>
<qresource prefix="/images/xhdpi">
<file alias="icon">android/res/drawable-xhdpi/icon.png</file>
<file alias="back">resources/images/drawable-xhdpi/back.png</file>
<file alias="icon">android/res/mipmap-xhdpi/ic_launcher.png</file>
<file alias="back">resources/images/drawable-xhdpi/ic_arrow_back_white_48dp.png</file>
<file alias="busy">resources/images/drawable-xhdpi/busy.png</file>
<file alias="busy_dark">resources/images/drawable-xhdpi/busy_dark.png</file>
<file alias="help">resources/images/drawable-xhdpi/help.png</file>
<file alias="help">resources/images/drawable-xhdpi/ic_help_outline_white_48dp.png</file>
<file alias="play">resources/images/drawable-xhdpi/play.png</file>
<file alias="next">resources/images/drawable-xhdpi/next.png</file>
<file alias="pause">resources/images/drawable-xhdpi/pause.png</file>
<file alias="remove">resources/images/drawable-xhdpi/remove.png</file>
<file alias="search">resources/images/drawable-xhdpi/search.png</file>
<file alias="search">resources/images/drawable-xhdpi/ic_search_white_48dp.png</file>
<file alias="previous">resources/images/drawable-xhdpi/previous.png</file>
<file alias="download">resources/images/drawable-xhdpi/download.png</file>
<file alias="download">resources/images/drawable-xhdpi/ic_file_download_black_48dp.png</file>
<file alias="settings">resources/images/drawable-xhdpi/settings.png</file>
<file alias="add_to_playlist">resources/images/drawable-xhdpi/add_to_playlist.png</file>
<file alias="add_to_playlist">resources/images/drawable-xhdpi/ic_playlist_add_black_48dp.png</file>
</qresource>
<qresource prefix="/images/xxhdpi">
<file alias="icon">android/res/drawable-xxhdpi/icon.png</file>
<file alias="back">resources/images/drawable-xxhdpi/back.png</file>
<file alias="icon">android/res/mipmap-xxhdpi/ic_launcher.png</file>
<file alias="back">resources/images/drawable-xxhdpi/ic_arrow_back_white_48dp.png</file>
<file alias="busy">resources/images/drawable-xxhdpi/busy.png</file>
<file alias="busy_dark">resources/images/drawable-xxhdpi/busy_dark.png</file>
<file alias="help">resources/images/drawable-xxhdpi/help.png</file>
<file alias="help">resources/images/drawable-xxhdpi/ic_help_outline_white_48dp.png</file>
<file alias="play">resources/images/drawable-xxhdpi/play.png</file>
<file alias="next">resources/images/drawable-xxhdpi/next.png</file>
<file alias="pause">resources/images/drawable-xxhdpi/pause.png</file>
<file alias="remove">resources/images/drawable-xxhdpi/remove.png</file>
<file alias="search">resources/images/drawable-xxhdpi/search.png</file>
<file alias="search">resources/images/drawable-xxhdpi/ic_search_white_48dp.png</file>
<file alias="previous">resources/images/drawable-xxhdpi/previous.png</file>
<file alias="download">resources/images/drawable-xxhdpi/download.png</file>
<file alias="download">resources/images/drawable-xxhdpi/ic_file_download_black_48dp.png</file>
<file alias="settings">resources/images/drawable-xxhdpi/settings.png</file>
<file alias="add_to_playlist">resources/images/drawable-xxhdpi/add_to_playlist.png</file>
<file alias="add_to_playlist">resources/images/drawable-xxhdpi/ic_playlist_add_black_48dp.png</file>
</qresource>
<qresource prefix="/images/xxxhdpi">
<file alias="icon">android/res/drawable-xxxhdpi/icon.png</file>
<file alias="back">resources/images/drawable-xxxhdpi/back.png</file>
<file alias="icon">android/res/mipmap-xxxhdpi/ic_launcher.png</file>
<file alias="back">resources/images/drawable-xxxhdpi/ic_arrow_back_white_48dp.png</file>
<file alias="busy">resources/images/drawable-xxxhdpi/busy.png</file>
<file alias="busy_dark">resources/images/drawable-xxxhdpi/busy_dark.png</file>
<file alias="help">resources/images/drawable-xxxhdpi/help.png</file>
<file alias="help">resources/images/drawable-xxxhdpi/ic_help_outline_white_48dp.png</file>
<file alias="play">resources/images/drawable-xxxhdpi/play.png</file>
<file alias="next">resources/images/drawable-xxxhdpi/next.png</file>
<file alias="pause">resources/images/drawable-xxxhdpi/pause.png</file>
<file alias="remove">resources/images/drawable-xxxhdpi/remove.png</file>
<file alias="search">resources/images/drawable-xxxhdpi/search.png</file>
<file alias="search">resources/images/drawable-xxxhdpi/ic_search_white_48dp.png</file>
<file alias="previous">resources/images/drawable-xxxhdpi/previous.png</file>
<file alias="download">resources/images/drawable-xxxhdpi/download.png</file>
<file alias="download">resources/images/drawable-xxxhdpi/ic_file_download_black_48dp.png</file>
<file alias="settings">resources/images/drawable-xxxhdpi/settings.png</file>
<file alias="add_to_playlist">resources/images/drawable-xxxhdpi/add_to_playlist.png</file>
<file alias="add_to_playlist">resources/images/drawable-xxxhdpi/ic_playlist_add_black_48dp.png</file>
</qresource>
<qresource prefix="/fonts">
<file alias="Roboto-Black">resources/fonts/Roboto-Black.ttf</file>
<file alias="Roboto-BlackItalic">resources/fonts/Roboto-BlackItalic.ttf</file>
<file alias="Roboto-Bold">resources/fonts/Roboto-Bold.ttf</file>
<file alias="Roboto-BoldItalic">resources/fonts/Roboto-BoldItalic.ttf</file>
<file alias="RobotoCondensed-Bold">resources/fonts/RobotoCondensed-Bold.ttf</file>
<file alias="RobotoCondensed-BoldItalic">resources/fonts/RobotoCondensed-BoldItalic.ttf</file>
<file alias="RobotoCondensed-Italic">resources/fonts/RobotoCondensed-Italic.ttf</file>
<file alias="RobotoCondensed-Light">resources/fonts/RobotoCondensed-Light.ttf</file>
<file alias="RobotoCondensed-LightItalic">resources/fonts/RobotoCondensed-LightItalic.ttf</file>
<file alias="RobotoCondensed-Regular">resources/fonts/RobotoCondensed-Regular.ttf</file>
<file alias="Roboto-Italic">resources/fonts/Roboto-Italic.ttf</file>
<file alias="Roboto-Light">resources/fonts/Roboto-Light.ttf</file>
<file alias="Roboto-LightItalic">resources/fonts/Roboto-LightItalic.ttf</file>
Expand Down
Binary file removed resources/fonts/RobotoCondensed-Bold.ttf
View file
Binary file not shown.
Binary file removed resources/fonts/RobotoCondensed-BoldItalic.ttf
View file
Binary file not shown.
Binary file removed resources/fonts/RobotoCondensed-Italic.ttf
View file
Binary file not shown.
Binary file removed resources/fonts/RobotoCondensed-Light.ttf
View file
Binary file not shown.
Binary file removed resources/fonts/RobotoCondensed-LightItalic.ttf
View file
Binary file not shown.
Binary file removed resources/fonts/RobotoCondensed-Regular.ttf
View file
Binary file not shown.
65 changes: 0 additions & 65 deletions resources/images/add_to_playlist.svg
View file

This file was deleted.

53 changes: 0 additions & 53 deletions resources/images/back.svg
View file

This file was deleted.

Loading

0 comments on commit 8cebf1f

Please sign in to comment.