Skip to content

Commit f255dd8

Browse files
MuneefmMuneefm
committed
Full version udpdate.
new login loading
1 parent 107efdc commit f255dd8

File tree

6 files changed

+68
-39
lines changed

6 files changed

+68
-39
lines changed

‎.idea/misc.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
42
repositories {
53
jcenter()
64
google()
5+
maven {
6+
url 'https://maven.fabric.io/public'
7+
}
8+
79
}
810
dependencies {
911
classpath 'com.android.tools.build:gradle:3.0.1'
10-
classpath 'com.google.gms:google-services:3.0.0'
12+
classpath 'com.google.gms:google-services:3.1.2'
13+
classpath 'io.fabric.tools:gradle:1.25.1'
14+
1115
// NOTE: Do not place your application dependencies here; they belong
1216
// in the individual module build.gradle files
1317
}
@@ -17,14 +21,18 @@ allprojects {
1721
repositories {
1822
jcenter()
1923
maven { url "https://jitpack.io" }
20-
maven { url 'https://maven.fabric.io/public' }
2124
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
22-
25+
maven {
26+
url 'https://maven.fabric.io/public'
27+
}
28+
maven {
29+
url 'https://maven.google.com/'
30+
}
2331

2432
google()
2533
}
2634
}
2735

2836
task clean(type: Delete) {
2937
delete rootProject.buildDir
30-
}
38+
}

‎mobile/build.gradle

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
apply plugin: 'com.android.application'
2+
//apply plugin: 'io.fabric'
23

34
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
5+
compileSdkVersion 27
6+
buildToolsVersion "27.0.3"
67
defaultConfig {
78
applicationId "mnf.android.wearnote"
89
minSdkVersion 19
9-
targetSdkVersion 25
10+
targetSdkVersion 27
1011
multiDexEnabled true
1112

1213
versionCode 14
@@ -23,49 +24,55 @@ android {
2324
checkReleaseBuilds false
2425
abortOnError false
2526
}
27+
configurations {
28+
all*.exclude group: 'com.android.support', module: 'support-v13'
29+
}
2630

2731
}
2832

29-
33+
def firebseVersion = '11.8.0'
34+
def supportVersion = '27.1.0'
3035
dependencies {
3136
compile fileTree(include: ['*.jar'], dir: 'libs')
3237
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
3338
exclude group: 'com.android.support', module: 'support-annotations'
3439
})
3540

3641
wearApp project(':wear')
37-
// compile files('libs/gson-2.8.0 .jar')
42+
// compile files('libs/gson-2.8.0 .jar')
3843

3944
compile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
4045

41-
compile 'com.google.firebase:firebase-core:10.0.1'
42-
compile 'com.google.firebase:firebase-auth:10.0.1'
43-
compile 'com.firebaseui:firebase-ui-auth:1.0.1'
44-
compile 'com.google.firebase:firebase-ads:10.0.1'
45-
compile 'com.google.firebase:firebase-storage:10.0.1'
46+
compile "com.google.firebase:firebase-core:$firebseVersion"
47+
compile "com.google.firebase:firebase-auth:$firebseVersion"
48+
compile 'com.firebaseui:firebase-ui-auth:3.2.2'
49+
compile "com.google.firebase:firebase-ads:$firebseVersion"
50+
compile "com.google.firebase:firebase-storage:$firebseVersion"
4651

4752

48-
compile 'com.google.android.gms:play-services:10.0.1'
49-
compile 'com.android.support:appcompat-v7:25.1.0'
50-
compile 'com.android.support:design:25.1.0'
51-
compile 'com.android.support:preference-v7:25.1.0'
52-
compile 'com.android.support:preference-v14:25.1.0'
53-
compile 'com.android.support:support-v4:25.1.0'
54-
compile 'com.android.support:appcompat-v7:25.1.0'
53+
compile "com.google.android.gms:play-services:$firebseVersion"
54+
implementation "com.android.support:appcompat-v7:$supportVersion"
55+
implementation "com.android.support:design:$supportVersion"
56+
implementation "com.android.support:preference-v7:$supportVersion"
57+
implementation "com.android.support:preference-v14:$supportVersion"
58+
implementation "com.android.support:support-v4:$supportVersion"
59+
implementation "com.android.support:appcompat-v7:$supportVersion"
5560

5661

5762
compile 'com.jakewharton:butterknife:8.4.0'
58-
compile 'com.android.support:multidex:1.0.1'
63+
compile 'com.android.support:multidex:1.0.3'
5964
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
6065
compile 'com.thebluealliance:spectrum:0.7.1'
6166
compile 'com.github.florent37:singledateandtimepicker:1.0.4'
6267
testCompile 'junit:junit:4.12'
6368
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
6469
compile 'com.getbase:floatingactionbutton:1.10.1'
65-
compile 'com.afollestad.material-dialogs:core:0.9.3.0'
70+
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
6671
compile 'com.squareup.picasso:picasso:2.5.2'
6772
wearApp project(':wear')
68-
compile 'com.anjlab.android.iab.v3:library:1.0.+'
73+
compile 'com.anjlab.android.iab.v3:library:1.0.44'
74+
75+
//compile 'com.crashlytics.sdk.android:crashlytics:2.9.1'
6976

7077

7178
}

‎mobile/src/main/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
</action>
6060
</intent-filter>
6161
</receiver>
62+
<provider
63+
android:name="com.activeandroid.content.ContentProvider"
64+
android:authorities="mnf.android.wearnote"
65+
android:enabled="true"
66+
android:exported="false" />
67+
6268
</application>
6369

6470
</manifest>

‎mobile/src/main/java/mnf/android/wearnote/MainActivity.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ protected void onCreate(Bundle savedInstanceState) {
162162
mFirebaseAuthStateListener = new FirebaseAuth.AuthStateListener() {
163163
@Override
164164
public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
165+
hideProgressLoading();
165166
FirebaseUser user = firebaseAuth.getCurrentUser();
166167
String proTag = "";
167168
if(pref!=null){
@@ -236,6 +237,7 @@ public void setPurchaseCallback(PurchaseCallback mCallback){
236237

237238
@Override
238239
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
240+
Log.e(TAG,"onActivityResult, requestCode = "+requestCode+"resultCode- "+resultCode);
239241
if (!bp.handleActivityResult(requestCode, resultCode, data)) {
240242
super.onActivityResult(requestCode, resultCode, data);
241243
}
@@ -287,15 +289,24 @@ public void openauthenticationView(){
287289
startActivityForResult(
288290
AuthUI.getInstance()
289291
.createSignInIntentBuilder()
290-
.setTheme(R.style.LoginTheme)
292+
//.setTheme(R.style.LoginTheme)
291293

292294
.setIsSmartLockEnabled(false)
293-
.setProviders(Arrays.asList(
294-
new AuthUI.IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build()) //new AuthUI.IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build())
295+
296+
.setAvailableProviders(Arrays.asList(
297+
// new AuthUI.IdpConfig.Builder(AuthUI.GOOGLE_PROVIDER).build(),
298+
new AuthUI.IdpConfig.GoogleBuilder().build()
299+
) //new AuthUI.IdpConfig.Builder(AuthUI.EMAIL_PROVIDER).build())
295300
)
296301

297302
.build(),
298303
RC_SIGN_IN);
304+
showProgressLoading("We are login you in...","Please hang on");
305+
/* new MaterialDialog.Builder(c)
306+
.title("Please hang on")
307+
.content("We are login you in...")
308+
.progress(true, 0)
309+
.show();*/
299310

300311
}
301312

‎wear/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 27
5+
buildToolsVersion "27.0.3"
66
defaultConfig {
77
applicationId "mnf.android.wearnote"
88
minSdkVersion 23
9-
targetSdkVersion 25
9+
targetSdkVersion 27
1010
versionCode 15
1111
versionName "2.3"
1212
}
@@ -28,9 +28,9 @@ dependencies {
2828

2929

3030
compile 'com.google.android.support:wearable:2.0.0-beta2'
31-
compile 'com.google.android.gms:play-services-wearable:10.0.1'
31+
compile 'com.google.android.gms:play-services-wearable:12.0.0'
3232
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
33-
compile 'com.android.support:appcompat-v7:25.1.0'
33+
compile 'com.android.support:appcompat-v7:27.1.0'
3434
compile 'com.android.support.constraint:constraint-layout:1.0.2'
35-
provided 'com.google.android.wearable:wearable:1.0.0'
36-
}
35+
provided 'com.google.android.wearable:wearable:2.2.0'
36+
}

0 commit comments

Comments
 (0)