Merge pull request #175 from ncapdevi/3.0.0

ncapdevi · web-flow · commit 996aecd056b3 · 2018-11-19T10:46:10.000-08:00
3.0.0
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,8 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
 /build
 /captures
 .idea
-/.idea/
+
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,9 +29,9 @@ dependencies {
     implementation project(':frag-nav')
     // implementation 'com.ncapdevi:frag-nav:2.2.1'
     implementation project(':frag-nav')
-    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
     implementation "com.android.support:design:$rootProject.ext.supportVersion"
+    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
     implementation "com.roughike:bottom-bar:2.3.1"
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.ncapdevi.sample">
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/app/src/main/java/com/ncapdevi/sample/activities/BottomTabsActivity.kt b/app/src/main/java/com/ncapdevi/sample/activities/BottomTabsActivity.kt
@@ -9,13 +9,11 @@ import com.ncapdevi.fragnav.FragNavController
 import com.ncapdevi.fragnav.FragNavLogger
 import com.ncapdevi.fragnav.FragNavSwitchController
 import com.ncapdevi.fragnav.FragNavTransactionOptions
-import com.ncapdevi.fragnav.tabhistory.FragNavTabHistoryController
 import com.ncapdevi.fragnav.tabhistory.UniqueTabHistoryStrategy
 import com.ncapdevi.sample.R
 import com.ncapdevi.sample.fragments.*
 import com.roughike.bottombar.BottomBar
 
-
 class BottomTabsActivity : AppCompatActivity(), BaseFragment.FragmentNavigation, FragNavController.TransactionListener, FragNavController.RootFragmentListener {
     override val numberOfRootFragments: Int = 5
 
@@ -55,8 +53,6 @@ class BottomTabsActivity : AppCompatActivity(), BaseFragment.FragmentNavigation,
             bottomBar.selectTabAtPosition(INDEX_NEARBY)
         }
 
-
-        fragNavController.executePendingTransactions()
         bottomBar.setOnTabSelectListener({ tabId ->
             when (tabId) {
                 R.id.bb_menu_recents -> fragNavController.switchTab(INDEX_RECENTS)
@@ -68,7 +64,6 @@ class BottomTabsActivity : AppCompatActivity(), BaseFragment.FragmentNavigation,
         }, initial)
 
         bottomBar.setOnTabReselectListener { fragNavController.clearStack() }
-
     }
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/com/ncapdevi/sample/fragments/BaseFragment.kt b/app/src/main/java/com/ncapdevi/sample/fragments/BaseFragment.kt
@@ -46,6 +46,6 @@ open class BaseFragment : Fragment() {
     }
 
     companion object {
-        val ARGS_INSTANCE = "com.ncapdevi.sample.argsInstance"
+       const val ARGS_INSTANCE = "com.ncapdevi.sample.argsInstance"
     }
 }
diff --git a/app/src/main/java/com/ncapdevi/sample/fragments/FavoritesFragment.kt b/app/src/main/java/com/ncapdevi/sample/fragments/FavoritesFragment.kt
@@ -1,5 +1,6 @@
 package com.ncapdevi.sample.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 
@@ -8,12 +9,13 @@ import android.view.View
  */
 class FavoritesFragment : BaseFragment() {
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         btn.setOnClickListener {
             mFragmentNavigation.pushFragment(FavoritesFragment.newInstance(mInt + 1))
         }
-        btn.text = javaClass.simpleName + " " + mInt
+        btn.text = """${javaClass.simpleName} $mInt"""
     }
 
     companion object {
diff --git a/app/src/main/java/com/ncapdevi/sample/fragments/FoodFragment.kt b/app/src/main/java/com/ncapdevi/sample/fragments/FoodFragment.kt
@@ -1,5 +1,6 @@
 package com.ncapdevi.sample.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 
@@ -8,12 +9,13 @@ import android.view.View
  */
 class FoodFragment : BaseFragment() {
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         btn.setOnClickListener {
             mFragmentNavigation.pushFragment(FoodFragment.newInstance(mInt + 1))
         }
-        btn.text = javaClass.simpleName + " " + mInt
+        btn.text = """${javaClass.simpleName} $mInt"""
     }
 
     companion object {
diff --git a/app/src/main/java/com/ncapdevi/sample/fragments/FriendsFragment.kt b/app/src/main/java/com/ncapdevi/sample/fragments/FriendsFragment.kt
@@ -1,5 +1,6 @@
 package com.ncapdevi.sample.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 
@@ -9,12 +10,13 @@ import android.view.View
 class FriendsFragment : BaseFragment() {
 
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         btn.setOnClickListener {
             mFragmentNavigation.pushFragment(FriendsFragment.newInstance(mInt + 1))
         }
-        btn.text = javaClass.simpleName + " " + mInt
+        btn.text = """${javaClass.simpleName} $mInt"""
     }
 
     companion object {
diff --git a/app/src/main/java/com/ncapdevi/sample/fragments/NearbyFragment.kt b/app/src/main/java/com/ncapdevi/sample/fragments/NearbyFragment.kt
@@ -1,5 +1,6 @@
 package com.ncapdevi.sample.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 
@@ -8,12 +9,13 @@ import android.view.View
  */
 class NearbyFragment : BaseFragment() {
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         btn.setOnClickListener {
             mFragmentNavigation.pushFragment(NearbyFragment.newInstance(mInt + 1))
         }
-        btn.text = javaClass.simpleName + " " + mInt
+        btn.text = """${javaClass.simpleName} $mInt"""
     }
 
     companion object {
diff --git a/app/src/main/java/com/ncapdevi/sample/fragments/RecentsFragment.kt b/app/src/main/java/com/ncapdevi/sample/fragments/RecentsFragment.kt
@@ -1,5 +1,6 @@
 package com.ncapdevi.sample.fragments
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 
@@ -9,12 +10,13 @@ import android.view.View
 class RecentsFragment : BaseFragment() {
 
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         btn.setOnClickListener {
             mFragmentNavigation.pushFragment(RecentsFragment.newInstance(mInt + 1))
         }
-        btn.text = javaClass.simpleName + " " + mInt
+        btn.text = """${javaClass.simpleName} $mInt"""
     }
 
     companion object {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
     tools:context=".activities.MainActivity"
-    android:id="@+id/container" android:orientation="vertical" android:gravity="center">
+    tools:ignore="HardcodedText">
+
     <Button
+        android:id="@+id/btnBottomTabs"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Bottom Tabs"
-        android:id="@+id/btnBottomTabs" android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:text="Bottom Tabs" />
+
     <Button
+        android:id="@+id/btnNavDrawer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Navigation Drawer"
-        android:id="@+id/btnNavDrawer" android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:text="Navigation Drawer" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="HardcodedText" >
 
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
     <EditText
-        android:id="@+id/edit_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        tools:ignore="LabelFor"
+        android:inputType="text" />
     <CheckBox
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/nav_header_nav_drawer.xml b/app/src/main/res/layout/nav_header_nav_drawer.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="@dimen/nav_header_height"
-              android:background="@drawable/side_nav_bar"
-              android:gravity="bottom"
-              android:orientation="vertical"
-              android:paddingBottom="@dimen/activity_vertical_margin"
-              android:paddingLeft="@dimen/activity_horizontal_margin"
-              android:paddingRight="@dimen/activity_horizontal_margin"
-              android:paddingTop="@dimen/activity_vertical_margin"
-              android:theme="@style/ThemeOverlay.AppCompat.Dark">
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/nav_header_height"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/side_nav_bar"
+    android:gravity="bottom"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    tools:ignore="HardcodedText">
 
     <TextView
         android:layout_width="match_parent"
@@ -19,7 +21,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
     <TextView
-        android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="www.github.com/ncapdevi/FragNav"/>
diff --git a/app/src/main/res/menu/activity_nav_drawer_drawer.xml b/app/src/main/res/menu/activity_nav_drawer_drawer.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="HardcodedText">
 
     <item
         android:id="@+id/bb_menu_recents"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -5,5 +5,4 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="nav_header_vertical_spacing">16dp</dimen>
     <dimen name="nav_header_height">120dp</dimen>
-    <dimen name="fab_margin">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,10 +1,8 @@
 <resources>
     <string name="app_name">FragNav</string>
-    <string name="title_activity_main2">Main2Activity</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
-    <string name="action_settings">Settings</string>
     <string name="title_activity_nav_drawer">NavDrawerActivity</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -1,23 +1,30 @@
 buildscript {
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.2.71'
     repositories {
         jcenter()
         google()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "de.mannodermaus.gradle.plugins:android-junit5:1.0.32"
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
         google()
+        jcenter()
+        mavenCentral()
+        maven { url "http://dl.bintray.com/jetbrains/spek" }
     }
 }
-
+repositories {
+    google()
+    jcenter()
+    mavenCentral()
+}
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
@@ -27,8 +34,8 @@ ext {
 
     junitVersion = '4.12'
     supportVersion = '27.1.1'
-    buildToolsVersion = '27.0.3'
+    buildToolsVersion = '28.0.3'
     minSdkVersion = 14
-    targetSdkVersion = 27
-    compileSdkVersion = 27
+    targetSdkVersion = 28
+    compileSdkVersion = 28
 }
diff --git a/frag-nav/.gitignore b/frag-nav/.gitignore
@@ -1,2 +1,3 @@
 /build
-pom.xml
+pom.xml
+.idea
diff --git a/frag-nav/build.gradle b/frag-nav/build.gradle
diff --git a/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.kt b/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavController.kt
diff --git a/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavTransactionOptions.kt b/frag-nav/src/main/java/com/ncapdevi/fragnav/FragNavTransactionOptions.kt
diff --git a/frag-nav/src/test/java/com/ncapdevi/fragnav/FragNavControllerRaceConditionSpec.kt b/frag-nav/src/test/java/com/ncapdevi/fragnav/FragNavControllerRaceConditionSpec.kt
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,6 @@ open class BaseFragment : Fragment() {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`companion object {`
`49`		`- val ARGS_INSTANCE = "com.ncapdevi.sample.argsInstance"`
	`49`	`+ const val ARGS_INSTANCE = "com.ncapdevi.sample.argsInstance"`
`50`	`50`	`}`
`51`	`51`	`}`