Use custom base fragment and switch to embedded qr-code scanner

10 files changed, 54 insertions, 19 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 50fdddc..2c9c6b3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,7 +79,7 @@ dependencies {
   implementation "android.arch.lifecycle:extensions:1.1.1"
   implementation "com.android.support:support-compat:27.1.1"
   implementation 'com.android.support:design:27.1.1'
-  implementation 'com.google.zxing:android-integration:3.3.0'
+  implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
   implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
   implementation 'org.slf4j:slf4j-api:1.7.25'
   //noinspection GradleDependency: inspection tool bug for logback-android
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
new file mode 100644
index 0000000..685950f
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseFragment.kt
@@ -0,0 +1,36 @@
+/*
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.pacien.tincapp.activities
+
+import android.support.annotation.LayoutRes
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.base_activity.*
+
+/**
+ * @author pacien
+ */
+abstract class BaseFragment : Fragment() {
+  private val rootView by lazy { base_activity_frame!! }
+
+  fun inflate(@LayoutRes layout: Int) = layoutInflater.inflate(layout, rootView, false)!!
+  fun inflate(inflateFunc: (LayoutInflater, ViewGroup?, Boolean) -> View) = inflateFunc(layoutInflater, rootView, false)
+}
diff --git a/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
index e4063bf..c55e889 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
@@ -18,16 +18,16 @@
 
 package org.pacien.tincapp.activities.common
 
-import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
+import org.pacien.tincapp.activities.BaseFragment
 import org.pacien.tincapp.context.App
 
 /**
  * @param pages ordered list of title and fragment pairs
  * @author pacien
  */
-class FragmentListPagerAdapter(private val pages: List<Pair<Int, Fragment>>,
+class FragmentListPagerAdapter(private val pages: List<Pair<Int, BaseFragment>>,
                                fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
 
   private val resources by lazy { App.getResources() }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt
index dae4413..57a6bee 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/PathInfoFragment.kt
@@ -18,18 +18,18 @@
 
 package org.pacien.tincapp.activities.configure
 
-import android.app.Fragment
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import org.pacien.tincapp.activities.BaseFragment
 import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.databinding.ConfigureToolsPathInfoFragmentBinding
 
 /**
  * @author pacien
  */
-class PathInfoFragment : Fragment() {
+class PathInfoFragment : BaseFragment() {
   private val appPaths = AppPaths
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt
index 0ad2f19..714a7ae 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/ToolsFragment.kt
@@ -18,13 +18,13 @@
 
 package org.pacien.tincapp.activities.configure
 
-import android.app.Fragment
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import org.pacien.tincapp.activities.BaseActivity
+import org.pacien.tincapp.activities.BaseFragment
 import org.pacien.tincapp.activities.configure.tools.EncryptDecryptPrivateKeysTool
 import org.pacien.tincapp.activities.configure.tools.GenerateConfigTool
 import org.pacien.tincapp.activities.configure.tools.JoinNetworkTool
@@ -33,7 +33,7 @@ import org.pacien.tincapp.databinding.ConfigureToolsFragmentBinding
 /**
  * @author pacien
  */
-class ToolsFragment : Fragment() {
+class ToolsFragment : BaseFragment() {
   private val parentActivity by lazy { activity as BaseActivity }
   private val generateConfigTool by lazy { GenerateConfigTool(parentActivity) }
   private val joinNetworkTool by lazy { JoinNetworkTool(this, parentActivity) }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt
index 82a4380..6656d86 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/configure/tools/JoinNetworkTool.kt
@@ -18,7 +18,6 @@
 
 package org.pacien.tincapp.activities.configure.tools
 
-import android.app.Fragment
 import android.content.Intent
 import android.view.View
 import com.google.zxing.integration.android.IntentIntegrator
@@ -26,6 +25,7 @@ import com.google.zxing.integration.android.IntentResult
 import kotlinx.android.synthetic.main.configure_tools_dialog_network_join.view.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.activities.BaseActivity
+import org.pacien.tincapp.activities.BaseFragment
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.commands.TincApp
 import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding
@@ -33,8 +33,8 @@ import org.pacien.tincapp.databinding.ConfigureToolsDialogNetworkJoinBinding
 /**
  * @author pacien
  */
-class JoinNetworkTool(parentFragment: Fragment, private val parentActivity: BaseActivity) : ConfigurationTool(parentActivity) {
-  private val scanner by lazy { IntentIntegrator(parentFragment) }
+class JoinNetworkTool(parentFragment: BaseFragment, private val parentActivity: BaseActivity) : ConfigurationTool(parentActivity) {
+  private val scanner by lazy { IntentIntegrator.forSupportFragment(parentFragment) }
   private var joinDialog: View? = null