Skip to content

Update dependencies and add launcher shortcuts to sample for some fun and pop #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android:
components:
- platform-tools
- tools
- build-tools-24.0.3
- android-24
- build-tools-25.0.0
- android-25

# Extras
- extra-google-google_play_services
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
<activity android:name=".ChooserActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<meta-data android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
</activity>

<!-- Chat demo -->
Expand All @@ -30,7 +31,11 @@
<activity
android:name=".auth.SignedInActivity"
android:label="@string/name_auth_ui" />
<activity android:name=".storage.ImageActivity"></activity>

<!-- Storage UI demo-->
<activity
android:name=".storage.ImageActivity"
android:label="@string/name_image" />
</application>

</manifest>
2 changes: 0 additions & 2 deletions app/src/main/res/fabric.properties

This file was deleted.

33 changes: 33 additions & 0 deletions app/src/main/res/xml-v25/shortcuts.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<shortcut
android:shortcutId="storage"
android:enabled="true"
android:icon="@mipmap/ic_launcher"
android:shortcutShortLabel="@string/name_image">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.firebase.uidemo"
android:targetClass="com.firebase.uidemo.storage.ImageActivity" />
</shortcut>
<shortcut
android:shortcutId="auth"
android:enabled="true"
android:icon="@drawable/firebase_auth_120dp"
android:shortcutShortLabel="@string/name_auth_ui">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.firebase.uidemo"
android:targetClass="com.firebase.uidemo.auth.AuthUiActivity" />
</shortcut>
<shortcut
android:shortcutId="database"
android:enabled="true"
android:icon="@mipmap/ic_launcher"
android:shortcutShortLabel="@string/name_chat">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.firebase.uidemo"
android:targetClass="com.firebase.uidemo.database.ChatActivity" />
</shortcut>
</shortcuts>
8 changes: 4 additions & 4 deletions common/constants.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
project.ext.firebase_version = '9.6.1'
project.ext.support_library_version = '24.2.1'
project.ext.support_library_version = '25.0.0'

project.ext.submodules = ['database', 'auth', 'storage']
project.ext.group = 'com.firebaseui'
project.ext.version = '0.6.1'
project.ext.pomdesc = 'Firebase UI Android'
project.ext.buildtools = '24.0.3'
project.ext.compileSdk = 24
project.ext.targetSdk = 24
project.ext.buildtools = '25.0.0'
project.ext.compileSdk = 25
project.ext.targetSdk = 25