Skip to content

Commit

Permalink
2.0 beta 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@DSteve595
DSteve595 committed Jul 9, 2014
1 parent 076362e commit 97973c9
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 59 deletions.
2 changes: 1 addition & 1 deletion app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="okio-1.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-5.0.77" level="project" />
<orderEntry type="library" exported="" name="mediarouter-v7-19.1.0" level="project" />
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
<orderEntry type="library" exported="" name="picasso-2.3.2" level="project" />
Expand All @@ -77,7 +78,6 @@
<orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
<orderEntry type="library" exported="" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" name="mediarouter-0.1.2" level="project" />
<orderEntry type="library" exported="" name="play-services-4.4.52" level="project" />
<orderEntry type="library" exported="" name="httpcore-4.3.2" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.0.0" level="project" />
<orderEntry type="module" module-name="aFileChooser" exported="" />
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 19
versionCode 60
versionCode 62
versionName '2.0.0-beta3'
}
compileOptions {
Expand Down
112 changes: 55 additions & 57 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
<manifest
package="com.stevenschoen.putionew"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.stevenschoen.putionew">

<uses-feature
android:name="android.hardware.touchscreen"
android:required="false"/>
android:required="false" />

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

<application
android:debuggable="false"
android:name=".PutioApplication"
android:icon="@drawable/ic_launcher"
android:label="@string/putio"
Expand All @@ -22,99 +20,99 @@

<meta-data
android:name="com.sec.android.support.multiwindow"
android:value="true"/>
android:value="true" />
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>
android:value="@integer/google_play_services_version" />

<activity
android:name=".activities.Putio"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER"/>
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH"/>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable"/>
android:resource="@xml/searchable" />
<meta-data
android:name="android.app.default_searchable"
android:value=".activities.Putio"/>
android:value=".activities.Putio" />
</activity>
<activity android:name=".activities.Setup"/>
<activity android:name=".activities.Setup" />
<activity
android:name=".activities.FileDetailsActivity"
android:parentActivityName=".activities.Putio">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.Putio"/>
android:value=".activities.Putio" />
</activity>
<activity
android:name=".activities.Preferences"
android:parentActivityName=".activities.Putio">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.Putio"/>
android:value=".activities.Putio" />
</activity>
<activity
android:name=".activities.FileFinished"
android:theme="@style/Putio.Dialog"/>
android:theme="@style/Putio.Dialog" />
<activity
android:name=".activities.AddTransfers"
android:theme="@style/Putio.Dialog">
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:mimeType="application/x-bittorrent"
android:scheme="http"/>
android:scheme="http" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="*"
android:pathPattern=".*\\.torrent"
android:scheme="http"/>
android:scheme="http" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:mimeType="application/x-bittorrent"
android:scheme="file"/>
android:scheme="file" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.DEFAULT" />

<data
android:pathPattern=".*\\.torrent"
android:scheme="file"/>
android:scheme="file" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:scheme="magnet"/>
<data android:scheme="magnet" />
</intent-filter>
</activity>
<activity
Expand All @@ -123,7 +121,7 @@
android:theme="@style/Putio.DialogOrActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.Putio"/>
android:value=".activities.Putio" />
</activity>

<activity
Expand All @@ -135,45 +133,45 @@
android:theme="@style/Theme.Putio.CastPlayer">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.Putio"/>
android:value=".activities.Putio" />
</activity>

<receiver android:name="com.google.sample.castcompanionlibrary.remotecontrol.VideoIntentReceiver">
<intent-filter>
<action android:name="android.media.AUDIO_BECOMING_NOISY"/>
<action android:name="android.intent.action.MEDIA_BUTTON"/>
<action android:name="android.media.VOLUME_CHANGED_ACTION"/>
<action android:name="com.google.sample.castcompanionlibrary.action.toggleplayback"/>
<action android:name="com.google.sample.castcompanionlibrary.action.stop"/>
<action android:name="android.media.AUDIO_BECOMING_NOISY" />
<action android:name="android.intent.action.MEDIA_BUTTON" />
<action android:name="android.media.VOLUME_CHANGED_ACTION" />
<action android:name="com.google.sample.castcompanionlibrary.action.toggleplayback" />
<action android:name="com.google.sample.castcompanionlibrary.action.stop" />
</intent-filter>
</receiver>

<receiver android:name=".OpenDownloadReceiver">
<intent-filter>
<action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED"/>
<action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED" />
</intent-filter>
</receiver>

<service android:name=".PutioOpenFileService"/>
<service android:name=".PutioTransfersService"/>
<service android:name=".model.PutioRestService"/>
<service android:name="com.stevenschoen.putionew.cast.CastService"/>
<service android:name=".PutioOpenFileService" />
<service android:name=".PutioTransfersService" />
<service android:name=".model.PutioRestService" />
<service android:name="com.stevenschoen.putionew.cast.CastService" />
<service
android:name="com.google.sample.castcompanionlibrary.notification.VideoCastNotificationService"
android:exported="false">
<intent-filter>
<action android:name="com.google.sample.castcompanionlibrary.action.toggleplayback"/>
<action android:name="com.google.sample.castcompanionlibrary.action.stop"/>
<action android:name="com.google.sample.castcompanionlibrary.action.notificationvisibility"/>
<action android:name="com.google.sample.castcompanionlibrary.action.toggleplayback" />
<action android:name="com.google.sample.castcompanionlibrary.action.stop" />
<action android:name="com.google.sample.castcompanionlibrary.action.notificationvisibility" />
</intent-filter>
</service>

<activity android:name="com.ipaulpro.afilechooser.FileChooserActivity"/>
<activity android:name="com.ipaulpro.afilechooser.FileChooserActivity" />
<activity
android:name=".activities.TransfersActivity"
android:excludeFromRecents="true"
android:taskAffinity="com.stevenschoen.putio.transfersdialog"
android:theme="@style/Putio.Dialog"/>
android:theme="@style/Putio.Dialog" />
</application>

</manifest>

0 comments on commit 97973c9

Please sign in to comment.