AndroidX update

build.gradle

@@ -1,25 +1,27 @@
 buildscript {
   repositories {
+    google()
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.1'
+    classpath 'com.android.tools.build:gradle:3.3.0'
   }
 }
 
 allprojects {
   repositories {
+    google()
     jcenter()
   }
 }
 
 ext {
-  compileSdkVersion = 25
-  buildToolsVersion = '25.0.3'
+  compileSdkVersion = 28
+  buildToolsVersion = '28.0.3'
 
-  supportDesign = 'com.android.support:design:25.3.1'
-  supportAppCompat = 'com.android.support:appcompat-v7:25.3.1'
-  bottomNavigationBar = 'com.ashokvarma.android:bottom-navigation-bar:1.4.1'
+  supportDesign = 'com.google.android.material:material:1.0.0-rc01'
+  supportAppCompat = 'androidx.appcompat:appcompat:1.0.0'
+  bottomNavigationBar = 'com.ashokvarma.android:bottom-navigation-bar:2.1.0'
 }
 
 task clean(type: Delete) {

gradle.properties

@@ -15,4 +15,7 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Jan 08 22:38:21 MSK 2017
+#Tue Jan 29 14:32:25 GST 2019
 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.10.1-all.zip

multibackstack-sample/build.gradle

@@ -1,9 +1,9 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-  compile project(':multibackstack')
-  compile rootProject.ext.supportDesign
-  compile rootProject.ext.bottomNavigationBar
+  implementation project(':multibackstack')
+  implementation rootProject.ext.supportDesign
+  implementation rootProject.ext.bottomNavigationBar
 }
 
 android {

multibackstack-sample/src/main/java/com/jetradar/multibackstack/sample/ItemFragment.java

@@ -17,64 +17,66 @@
 package com.jetradar.multibackstack.sample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.Fragment;
+
 public class ItemFragment extends Fragment {
-  private static final String ARG_ITEM = "item";
+    private static final String ARG_ITEM = "item";
 
-  private String item;
+    private String item;
 
-  public ItemFragment() {}
+    public ItemFragment() {
+    }
 
-  public static ItemFragment newInstance(String item) {
-    ItemFragment fragment = new ItemFragment();
-    Bundle args = new Bundle();
-    args.putString(ARG_ITEM, item);
-    fragment.setArguments(args);
-    return fragment;
-  }
+    public static ItemFragment newInstance(String item) {
+        ItemFragment fragment = new ItemFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_ITEM, item);
+        fragment.setArguments(args);
+        return fragment;
+    }
 
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    item = getArguments().getString(ARG_ITEM);
-  }
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        item = getArguments().getString(ARG_ITEM);
+    }
 
-  @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_item, container, false);
-  }
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_item, container, false);
+    }
 
-  @Override
-  public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-    setUpActionBar();
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        setUpActionBar();
 
-    TextView textView = (TextView) view.findViewById(R.id.text);
-    textView.setText(item);
-  }
+        TextView textView = (TextView) view.findViewById(R.id.text);
+        textView.setText(item);
+    }
 
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home:
-        getActivity().onBackPressed();
-        return true;
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                getActivity().onBackPressed();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
     }
-    return super.onOptionsItemSelected(item);
-  }
 
-  @SuppressWarnings("ConstantConditions")
-  private void setUpActionBar() {
-    ActionBar actionBar = ((MainActivity) getActivity()).getSupportActionBar();
-    actionBar.setDisplayHomeAsUpEnabled(true);
-    actionBar.setTitle(item);
-    setHasOptionsMenu(true);
-  }
+    @SuppressWarnings("ConstantConditions")
+    private void setUpActionBar() {
+        ActionBar actionBar = ((MainActivity) getActivity()).getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setTitle(item);
+        setHasOptionsMenu(true);
+    }
 }

multibackstack-sample/src/main/java/com/jetradar/multibackstack/sample/ItemListFragment.java

@@ -17,65 +17,67 @@
 package com.jetradar.multibackstack.sample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ListFragment;
-import android.support.v7.app.ActionBar;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.ListFragment;
+
 public class ItemListFragment extends ListFragment {
-  private static final String ARG_SECTION = "section";
+    private static final String ARG_SECTION = "section";
 
-  private List<String> items;
+    private List<String> items;
 
-  public ItemListFragment() {}
+    public ItemListFragment() {
+    }
 
-  public static ItemListFragment newInstance(String section) {
-    ItemListFragment fragment = new ItemListFragment();
-    Bundle args = new Bundle();
-    args.putString(ARG_SECTION, section);
-    fragment.setArguments(args);
-    return fragment;
-  }
+    public static ItemListFragment newInstance(String section) {
+        ItemListFragment fragment = new ItemListFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_SECTION, section);
+        fragment.setArguments(args);
+        return fragment;
+    }
 
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    String section = getArguments().getString(ARG_SECTION);
-    items = createItemsForSection(section);
-  }
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String section = getArguments().getString(ARG_SECTION);
+        items = createItemsForSection(section);
+    }
 
-  @Override
-  public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-    super.onActivityCreated(savedInstanceState);
-    setUpActionBar();
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        setUpActionBar();
 
-    ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1, items);
-    setListAdapter(adapter);
-  }
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1, items);
+        setListAdapter(adapter);
+    }
 
-  @Override
-  public void onListItemClick(ListView l, View v, int position, long id) {
-    ((MainActivity) getActivity()).showFragment(ItemFragment.newInstance(items.get(position)));
-  }
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        ((MainActivity) getActivity()).showFragment(ItemFragment.newInstance(items.get(position)));
+    }
 
-  private List<String> createItemsForSection(String section) {
-    int itemsNumber = 10;
-    List<String> items = new ArrayList<>(itemsNumber);
-    for (int i = 0; i < itemsNumber; i++) {
-      items.add(section + " " + (i + 1));
+    private List<String> createItemsForSection(String section) {
+        int itemsNumber = 10;
+        List<String> items = new ArrayList<>(itemsNumber);
+        for (int i = 0; i < itemsNumber; i++) {
+            items.add(section + " " + (i + 1));
+        }
+        return items;
     }
-    return items;
-  }
 
-  @SuppressWarnings("ConstantConditions")
-  private void setUpActionBar() {
-    ActionBar actionBar = ((MainActivity) getActivity()).getSupportActionBar();
-    actionBar.setDisplayHomeAsUpEnabled(false);
-    actionBar.setTitle(R.string.app_name);
-  }
+    @SuppressWarnings("ConstantConditions")
+    private void setUpActionBar() {
+        ActionBar actionBar = ((MainActivity) getActivity()).getSupportActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(false);
+        actionBar.setTitle(R.string.app_name);
+    }
 }