Skip to content

Commit 63594b1

Browse files
author
Jorge Costa
authored
Merge pull request #37 from massivedisaster/feature/fix_adal_changes
Fixed errors
2 parents f4922e7 + d805f20 commit 63594b1

9 files changed

Lines changed: 13 additions & 16 deletions

File tree

.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.

activity-fragment-manager/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ publish {
7878
userOrg = "jmspt"
7979
groupId = "com.massivedisaster"
8080
artifactId = 'activity-fragment-manager'
81-
publishVersion = "0.4.1"
81+
publishVersion = "0.4.2"
8282
desc = 'Activity Fragment Manager'
8383
website = websiteBase
8484
licences = licensesBase

deploy/configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"basePath": "../",
33
"readmePath": "../README.md",
4-
"version": "0.4.1",
4+
"version": "0.4.2",
55
"modules": [
66
"activity-fragment-manager"
77
]

sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ dependencies {
5252
compile 'android.arch.lifecycle:extensions:1.0.0-alpha9'
5353
compile 'com.massivedisaster.adal:adal-fragments:0.1.15'
5454
compile 'com.massivedisaster.adal:adal-adapters:0.1.15'
55-
compile 'com.github.bumptech.glide:glide:4.0.0'
55+
compile 'com.github.bumptech.glide:glide:3.7.0'
5656
compile project(':activity-fragment-manager')
5757
}

sample/src/main/java/com/massivedisaster/example/feature/backpressed/FragmentOnBackPressed.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
import android.widget.TextView;
3131

3232
import com.massivedisaster.activitymanager.OnBackPressedListener;
33-
import com.massivedisaster.adal.fragment.AbstractBaseFragment;
33+
import com.massivedisaster.adal.fragment.BaseFragment;
3434
import com.massivedisaster.example.activitymanager.R;
3535

3636
/**
3737
* FragmentOnBackPressed
3838
*/
39-
public class FragmentOnBackPressed extends AbstractBaseFragment implements OnBackPressedListener {
39+
public class FragmentOnBackPressed extends BaseFragment implements OnBackPressedListener {
4040

4141
private int mNumberOfBacks;
4242
private TextView mTxtCount;

sample/src/main/java/com/massivedisaster/example/feature/home/FragmentHome.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import android.view.View;
3131
import android.widget.Button;
3232

33-
import com.massivedisaster.adal.fragment.AbstractBaseFragment;
33+
import com.massivedisaster.adal.fragment.BaseFragment;
3434
import com.massivedisaster.example.activity.ActivityFullscreen;
3535
import com.massivedisaster.example.activity.ActivityToolbar;
3636
import com.massivedisaster.example.activitymanager.R;
@@ -43,7 +43,7 @@
4343
/**
4444
* Fragment Home
4545
*/
46-
public class FragmentHome extends AbstractBaseFragment implements View.OnClickListener {
46+
public class FragmentHome extends BaseFragment implements View.OnClickListener {
4747

4848
@Override
4949
protected int layoutToInflate() {

sample/src/main/java/com/massivedisaster/example/feature/navigation/FragmentAddReplace.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
import com.massivedisaster.activitymanager.ActivityFragmentManager;
3737
import com.massivedisaster.activitymanager.activity.AbstractFragmentActivity;
3838
import com.massivedisaster.activitymanager.animation.TransactionAnimation;
39-
import com.massivedisaster.adal.fragment.AbstractBaseFragment;
39+
import com.massivedisaster.adal.fragment.BaseFragment;
4040
import com.massivedisaster.example.activitymanager.R;
4141

4242
/**
4343
* Fragment Add Replace
4444
* Fragment with some features to add and remove more fragments.
4545
*/
46-
public class FragmentAddReplace extends AbstractBaseFragment implements View.OnClickListener {
46+
public class FragmentAddReplace extends BaseFragment implements View.OnClickListener {
4747

4848
private static final String VALUE = "value";
4949
private String mValue;

sample/src/main/java/com/massivedisaster/example/feature/sharedelements/FragmentSharedElement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131

3232
import com.bumptech.glide.Glide;
3333
import com.bumptech.glide.load.engine.DiskCacheStrategy;
34-
import com.massivedisaster.adal.fragment.AbstractBaseFragment;
34+
import com.massivedisaster.adal.fragment.BaseFragment;
3535
import com.massivedisaster.example.activitymanager.R;
3636

3737
/**
3838
* SHared Element Fragment
3939
* Fragment to show the transaction
4040
*/
41-
public class FragmentSharedElement extends AbstractBaseFragment {
41+
public class FragmentSharedElement extends BaseFragment {
4242

4343
private String mUrl;
4444

sample/src/main/java/com/massivedisaster/example/feature/sharedelements/FragmentSharedElementsOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
import com.massivedisaster.activitymanager.ActivityFragmentManager;
3535
import com.massivedisaster.adal.adapter.OnChildClickListener;
36-
import com.massivedisaster.adal.fragment.AbstractBaseFragment;
36+
import com.massivedisaster.adal.fragment.BaseFragment;
3737
import com.massivedisaster.example.activity.ActivityToolbar;
3838
import com.massivedisaster.example.activitymanager.R;
3939

@@ -43,7 +43,7 @@
4343
/**
4444
* Fragment Shared Elements Options
4545
*/
46-
public class FragmentSharedElementsOptions extends AbstractBaseFragment {
46+
public class FragmentSharedElementsOptions extends BaseFragment {
4747

4848

4949
@Override

0 commit comments

Comments
 (0)