Skip to content

Commit 9655d98

Browse files
authored
Merge pull request #87 from ncapdevi/2.2.0
2.2.0
2 parents 7af285b + 8be3b28 commit 9655d98

6 files changed

Lines changed: 25 additions & 16 deletions

File tree

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

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

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '25.0.3'
4+
compileSdkVersion 26
5+
buildToolsVersion '26.0.1'
66
lintOptions{
77
abortOnError false
88
}
99
defaultConfig {
1010
applicationId "com.ncapdevi.sample"
1111
minSdkVersion 15
12-
targetSdkVersion 25
12+
targetSdkVersion 26
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -28,8 +28,8 @@ dependencies {
2828
compile fileTree(include: ['*.jar'], dir: 'libs')
2929
//compile project(':frag-nav')
3030
testCompile 'junit:junit:4.12'
31-
compile 'com.android.support:appcompat-v7:25.4.0'
32-
implementation 'com.android.support:design:25.4.0'
31+
compile 'com.android.support:appcompat-v7:26.0.2'
32+
implementation 'com.android.support:design:26.0.2'
3333
compile 'com.roughike:bottom-bar:2.0.2'
3434
// compile 'com.ncapdevi:frag-nav:1.3.0'
3535
compile project(':frag-nav')

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
12+
classpath 'com.android.tools.build:gradle:3.0.0-beta4'
1313
}
1414
}
1515

frag-nav/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ext {
2121
siteUrl = 'https://github.com/ncapdevi/FragNav'
2222
gitUrl = 'https://github.com/ncapdevi/FragNav.git'
2323

24-
libraryVersion = '2.1.0'
24+
libraryVersion = '2.2.0'
2525

2626
developerId = 'ncapdevi'
2727
developerName = 'Nic Capdevila'
@@ -34,16 +34,16 @@ ext {
3434

3535

3636
android {
37-
compileSdkVersion 25
37+
compileSdkVersion 26
3838
buildToolsVersion '25.0.3'
3939

4040
lintOptions{
4141
abortOnError false
4242
}
4343
defaultConfig {
44-
minSdkVersion 12
45-
targetSdkVersion 25
46-
versionCode 13
44+
minSdkVersion 14
45+
targetSdkVersion 26
46+
versionCode 14
4747
versionName libraryVersion
4848
}
4949
buildTypes {
@@ -59,8 +59,8 @@ android {
5959

6060
dependencies {
6161
compile fileTree(include: ['*.jar'], dir: 'libs')
62-
compile 'com.android.support:appcompat-v7:25.4.0'
63-
compile 'com.android.support:support-annotations:25.4.0'
62+
compile 'com.android.support:appcompat-v7:26.0.2'
63+
compile 'com.android.support:support-annotations:26.0.2'
6464
testCompile "junit:junit:$rootProject.ext.junitVersion"
6565
testCompile "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
6666
testCompile "org.powermock:powermock-module-junit4:$rootProject.ext.powerMockito"

frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,15 @@ public boolean isRootFragment() {
784784
return stack == null || stack.size() == 1;
785785
}
786786

787+
/**
788+
* Helper function to get wether the fragmentManger has gone through a stateSave, if this is true, you probably want to commit allowing stateloss
789+
*
790+
* @return if fragmentManger isStateSaved
791+
*/
792+
public boolean isStateSaved(){
793+
return mFragmentManager.isStateSaved();
794+
}
795+
787796
//endregion
788797

789798
//region SavedInstanceState
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Aug 05 14:46:06 PDT 2017
1+
#Thu Sep 07 16:39:57 PDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)