Material Dialogs 0.7.3.0
This commit is contained in:
Aidan Follestad
parent
4801e6422a
commit
69970dd80f
2 changed files with 1 additions and 232 deletions
|
|
@ -69,7 +69,7 @@ dependencies {
|
|||
compile 'de.hdodenhof:circleimageview:1.2.2'
|
||||
compile 'com.github.bumptech.glide:glide:3.5.2'
|
||||
|
||||
compile 'com.afollestad:material-dialogs:0.7.2.8'
|
||||
compile 'com.afollestad:material-dialogs:0.7.3.0'
|
||||
compile 'com.jpardogo.materialtabstrip:library:1.0.9'
|
||||
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
|
||||
compile 'com.melnykov:floatingactionbutton:1.3.0'
|
||||
|
|
|
|||
|
|
@ -1,231 +0,0 @@
|
|||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from AndroidManifest.xml:2:1
|
||||
package
|
||||
ADDED from AndroidManifest.xml:3:5
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
android:versionName
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
xmlns:android
|
||||
ADDED from AndroidManifest.xml:2:11
|
||||
android:versionCode
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
uses-permission#android.permission.WAKE_LOCK
|
||||
ADDED from AndroidManifest.xml:5:5
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:5:22
|
||||
uses-permission#android.permission.READ_EXTERNAL_STORAGE
|
||||
ADDED from AndroidManifest.xml:6:5
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:6:22
|
||||
uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
|
||||
ADDED from AndroidManifest.xml:7:5
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:7:22
|
||||
uses-permission#android.permission.VIBRATE
|
||||
ADDED from AndroidManifest.xml:8:5
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:8:22
|
||||
uses-permission#android.permission.INTERNET
|
||||
ADDED from AndroidManifest.xml:9:5
|
||||
MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:9:5
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:9:22
|
||||
application
|
||||
ADDED from AndroidManifest.xml:11:5
|
||||
MERGED from com.afollestad:material-dialogs:0.6.4.1:12:5
|
||||
MERGED from com.android.support:appcompat-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:appcompat-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:gridlayout-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:palette-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v13:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:cardview-v7:22.0.0:22:5
|
||||
MERGED from com.nhaarman.listviewanimations:lib-core:3.1.0:26:5
|
||||
MERGED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:26:5
|
||||
MERGED from com.nhaarman.listviewanimations:lib-core-slh:3.1.0:26:5
|
||||
MERGED from com.melnykov:floatingactionbutton:1.2.0:12:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:22:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:11:5
|
||||
MERGED from com.crashlytics.sdk.android:answers:1.1.1:9:5
|
||||
MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5
|
||||
MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5
|
||||
MERGED from com.crashlytics.sdk.android:beta:1.1.1:9:5
|
||||
MERGED from io.fabric.sdk.android:fabric:1.1.1:9:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:22:5
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:15:9
|
||||
android:allowBackup
|
||||
ADDED from AndroidManifest.xml:13:9
|
||||
android:icon
|
||||
ADDED from AndroidManifest.xml:14:9
|
||||
android:theme
|
||||
ADDED from AndroidManifest.xml:16:9
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:12:9
|
||||
activity#com.kabouzeid.gramophone.ui.activities.MainActivity
|
||||
ADDED from AndroidManifest.xml:17:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:19:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:18:13
|
||||
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
|
||||
ADDED from AndroidManifest.xml:20:13
|
||||
action#android.intent.action.MAIN
|
||||
ADDED from AndroidManifest.xml:21:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:21:25
|
||||
category#android.intent.category.LAUNCHER
|
||||
ADDED from AndroidManifest.xml:23:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:23:27
|
||||
activity#com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity
|
||||
ADDED from AndroidManifest.xml:26:9
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:26:19
|
||||
activity#com.kabouzeid.gramophone.ui.activities.ArtistDetailActivity
|
||||
ADDED from AndroidManifest.xml:28:9
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:28:19
|
||||
activity#com.kabouzeid.gramophone.ui.activities.MusicControllerActivity
|
||||
ADDED from AndroidManifest.xml:30:9
|
||||
android:parentActivityName
|
||||
ADDED from AndroidManifest.xml:32:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:31:13
|
||||
service#com.kabouzeid.gramophone.service.MusicService
|
||||
ADDED from AndroidManifest.xml:35:9
|
||||
android:enabled
|
||||
ADDED from AndroidManifest.xml:37:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:36:13
|
||||
receiver#com.kabouzeid.gramophone.service.MediaButtonIntentReceiver
|
||||
ADDED from AndroidManifest.xml:40:9
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:40:19
|
||||
intent-filter#android.intent.action.MEDIA_BUTTON
|
||||
ADDED from AndroidManifest.xml:41:13
|
||||
action#android.intent.action.MEDIA_BUTTON
|
||||
ADDED from AndroidManifest.xml:42:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:42:25
|
||||
meta-data#com.crashlytics.ApiKey
|
||||
ADDED from AndroidManifest.xml:46:9
|
||||
android:value
|
||||
ADDED from AndroidManifest.xml:48:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:47:13
|
||||
activity#com.kabouzeid.gramophone.ui.activities.tageditor.SongTagEditorActivity
|
||||
ADDED from AndroidManifest.xml:50:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:52:13
|
||||
android:windowSoftInputMode
|
||||
ADDED from AndroidManifest.xml:53:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:51:13
|
||||
activity#com.kabouzeid.gramophone.ui.activities.tageditor.AlbumTagEditorActivity
|
||||
ADDED from AndroidManifest.xml:55:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:57:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:56:13
|
||||
activity#com.kabouzeid.gramophone.ui.activities.SearchActivity
|
||||
ADDED from AndroidManifest.xml:59:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:61:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:60:13
|
||||
receiver#com.kabouzeid.gramophone.widget.MusicPlayerWidget
|
||||
ADDED from AndroidManifest.xml:64:9
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:64:19
|
||||
intent-filter#android.appwidget.action.APPWIDGET_UPDATE
|
||||
ADDED from AndroidManifest.xml:65:13
|
||||
action#android.appwidget.action.APPWIDGET_UPDATE
|
||||
ADDED from AndroidManifest.xml:66:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:66:25
|
||||
meta-data#android.appwidget.provider
|
||||
ADDED from AndroidManifest.xml:69:13
|
||||
android:resource
|
||||
ADDED from AndroidManifest.xml:71:17
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:70:17
|
||||
activity#com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity
|
||||
ADDED from AndroidManifest.xml:74:9
|
||||
android:label
|
||||
ADDED from AndroidManifest.xml:76:13
|
||||
android:name
|
||||
ADDED from AndroidManifest.xml:75:13
|
||||
uses-sdk
|
||||
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
|
||||
MERGED from com.afollestad:material-dialogs:0.6.4.1:8:5
|
||||
MERGED from com.android.support:appcompat-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:appcompat-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:gridlayout-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:palette-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v13:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.android.support:cardview-v7:22.0.0:20:5
|
||||
MERGED from com.nhaarman.listviewanimations:lib-core:3.1.0:22:5
|
||||
MERGED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:22:5
|
||||
MERGED from com.nhaarman.listviewanimations:lib-core-slh:3.1.0:22:5
|
||||
MERGED from com.melnykov:floatingactionbutton:1.2.0:8:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.github.ksoichiro:android-observablescrollview:1.5.0:21:5
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:20:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
MERGED from com.crashlytics.sdk.android:crashlytics:2.2.1:7:5
|
||||
MERGED from com.crashlytics.sdk.android:answers:1.1.1:7:5
|
||||
MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5
|
||||
MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5
|
||||
MERGED from com.crashlytics.sdk.android:beta:1.1.1:7:5
|
||||
MERGED from io.fabric.sdk.android:fabric:1.1.1:7:5
|
||||
MERGED from asia.ivity.android:drag-sort-listview:1.0:6:5
|
||||
MERGED from com.android.support:support-v4:22.0.0:20:5
|
||||
android:targetSdkVersion
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
android:minSdkVersion
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
INJECTED from AndroidManifest.xml:0:0
|
||||
activity#android.support.v7.widget.TestActivity
|
||||
ADDED from com.android.support:recyclerview-v7:22.0.0:23:9
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:23:9
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:23:9
|
||||
MERGED from com.android.support:recyclerview-v7:22.0.0:23:9
|
||||
android:label
|
||||
ADDED from com.android.support:recyclerview-v7:22.0.0:25:13
|
||||
android:name
|
||||
ADDED from com.android.support:recyclerview-v7:22.0.0:24:13
|
||||
activity#com.nhaarman.listviewanimations.itemmanipulation.swipedismiss.SwipeTouchListenerTestActivity
|
||||
ADDED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:27:9
|
||||
android:name
|
||||
ADDED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:27:19
|
||||
activity#com.nhaarman.listviewanimations.itemmanipulation.dragdrop.DynamicListViewTestActivity
|
||||
ADDED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:28:9
|
||||
android:name
|
||||
ADDED from com.nhaarman.listviewanimations:lib-manipulation:3.1.0:28:19
|
||||
Loading…
Add table
Add a link
Reference in a new issue