Skip to content

Commit

Permalink
Some updates (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
tallnato authored Jun 12, 2018
1 parent be2d086 commit 375cd03
Show file tree
Hide file tree
Showing 30 changed files with 35 additions and 365 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ android:
components:
# The BuildTools version used by your project
- tools
- build-tools-25.0.2
- build-tools-27.0.3

# The SDK version used to compile your project
- android-25
- android-27

# Repos needed
- extra-android-m2repository
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'com.android.tools.build:gradle:3.1.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -14,6 +15,7 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu May 25 21:57:55 WEST 2017
#Mon Mar 26 22:13:27 WEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
12 changes: 5 additions & 7 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.3"

defaultConfig {
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 27
versionCode 1
versionName "1.0"
}
Expand All @@ -21,10 +21,8 @@ android {

dependencies {

compile 'com.facebook.android:facebook-android-sdk:[4,5)'
api 'com.facebook.android:facebook-android-sdk:4.33.0'

compile "io.reactivex.rxjava2:rxjava:2.1.0"

testCompile 'junit:junit:4.12'
implementation "io.reactivex.rxjava2:rxjava:2.1.12"

}
45 changes: 18 additions & 27 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,46 +1,37 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.youclap.rxfacebook">
package="com.youclap.rxfacebook">

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

<application>


<provider
android:authorities="${applicationId}.rxfacebookprovider"
android:exported="false"
android:enabled="true"
android:name=".RxFacebookInitProvider"/>

<activity
android:name=".login.FacebookLoginHandlerActivity"
android:theme="@style/Theme.Transparent"
android:launchMode="singleInstance"/>
android:name=".login.FacebookLoginHandlerActivity"
android:launchMode="singleInstance"
android:theme="@style/Theme.Transparent" />

<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />

<!--Facebook SDK needed -->
<activity
android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name"/>
android:name="com.facebook.FacebookActivity"
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />

<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<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="@string/fb_login_protocol_scheme"/>
<data android:scheme="@string/fb_login_protocol_scheme" />
</intent-filter>
</activity>

<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/>

</application>

</manifest>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package com.youclap.rxfacebook.login;

import android.content.Context;

import com.facebook.FacebookException;
import com.facebook.login.LoginResult;
import com.youclap.rxfacebook.RxFacebookInitProvider;

import java.util.Collection;

public final class RxFacebookLogin {

private static RxFacebookLoginMaybe mLoginObservable;

public static RxFacebookLoginMaybe logInWithReadPermissions(Collection<String> permissions) {
FacebookLoginHandlerActivity.start(RxFacebookInitProvider.getAppContext(), permissions);
public static RxFacebookLoginMaybe logInWithReadPermissions(Context context, Collection<String> permissions) {
FacebookLoginHandlerActivity.start(context, permissions);
mLoginObservable = new RxFacebookLoginMaybe();
return mLoginObservable;
}
Expand Down
18 changes: 0 additions & 18 deletions library/src/test/java/com/youclap/rxfacebook/ExampleUnitTest.java

This file was deleted.

1 change: 0 additions & 1 deletion sample/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions sample/build.gradle

This file was deleted.

25 changes: 0 additions & 25 deletions sample/proguard-rules.pro

This file was deleted.

24 changes: 0 additions & 24 deletions sample/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

Loading

0 comments on commit 375cd03

Please sign in to comment.