Update to 1.1.2

pembem22 · Nov 2, 2018 · 30188fa · 30188fa
1 parent 1def571
commit 30188fa
Show file tree

Hide file tree

Showing 14 changed files with 136 additions and 56 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 
 def versionMajor = 1
 def versionMinor = 1
-def versionPatch = 1
+def versionPatch = 2
 
 def props = new Properties()
 props.load(new FileInputStream(rootProject.file("release.properties")))
@@ -57,7 +57,6 @@ dependencies {
 
     implementation 'com.google.firebase:firebase-core:16.0.4'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
-    // implementation 'com.google.firebase:firebase-ads:17.0.0'
 
     implementation 'androidx.core:core-ktx:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'

diff --git a/app/src/main/java/me/andreww7985/connectplus/dfu/DfuView.kt b/app/src/main/java/me/andreww7985/connectplus/dfu/DfuView.kt
@@ -16,11 +16,9 @@ import me.andreww7985.connectplus.helpers.HexHelper
 import me.andreww7985.connectplus.helpers.UIHelper
 import me.andreww7985.connectplus.manager.PresenterManager
 import me.andreww7985.connectplus.mvp.BaseView
+import me.andreww7985.connectplus.ui.FragmentName
 
-class DfuView : Fragment(), BaseView {
-    companion object {
-        const val TAG = "DfuView"
-    }
+class DfuView : Fragment(), BaseView, FragmentName {
 
     private val presenter = PresenterManager.getPresenter(DfuPresenter::class.java) as DfuPresenter
 
@@ -187,4 +185,6 @@ class DfuView : Fragment(), BaseView {
             PresenterManager.destroyPresenter(DfuPresenter::class.java)
         }
     }
+
+    override fun getName() = "DFU"
 }
diff --git a/app/src/main/java/me/andreww7985/connectplus/manager/BleScanManager.kt b/app/src/main/java/me/andreww7985/connectplus/manager/BleScanManager.kt
@@ -27,7 +27,10 @@ object BleScanManager {
         }
     }
 
+    var isScanning = false
+
     fun startScan() {
+        isScanning = true
         bleScanner.startScan(null,
                 ScanSettings.Builder()
                         .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
@@ -36,7 +39,8 @@ object BleScanManager {
     }
 
     fun stopScan() {
-        // bleScanner.stopScan(scanCallback)
+        isScanning = false
+        bleScanner.stopScan(scanCallback)
     }
 
     fun isBleSupported() = BluetoothAdapter.getDefaultAdapter() != null && App.instance.packageManager.hasSystemFeature(FEATURE_BLUETOOTH_LE)

diff --git a/app/src/main/java/me/andreww7985/connectplus/speaker/SpeakerView.kt b/app/src/main/java/me/andreww7985/connectplus/speaker/SpeakerView.kt
@@ -13,8 +13,9 @@ import kotlinx.android.synthetic.main.fragment_dashboard.*
 import me.andreww7985.connectplus.R
 import me.andreww7985.connectplus.manager.PresenterManager
 import me.andreww7985.connectplus.mvp.BaseView
+import me.andreww7985.connectplus.ui.FragmentName
 
-class SpeakerView : BaseView, Fragment() {
+class SpeakerView : BaseView, Fragment(), FragmentName {
     companion object {
         const val TAG = "SpeakerView"
     }
@@ -49,7 +50,7 @@ class SpeakerView : BaseView, Fragment() {
         activity?.runOnUiThread {
             view ?: return@runOnUiThread
 
-            dashboard_battery_value.text = if (batteryCharging == true)
+            dashboard_battery_value.text = if (batteryCharging)
                 getString(R.string.dashboard_battery_level_charging, batteryLevel)
             else
                 getString(R.string.dashboard_battery_level, batteryLevel)
@@ -129,4 +130,6 @@ class SpeakerView : BaseView, Fragment() {
             PresenterManager.destroyPresenter(SpeakerPresenter::class.java)
         }
     }
+
+    override fun getName() = "Dashboard"
 }
diff --git a/app/src/main/java/me/andreww7985/connectplus/ui/FragmentName.kt b/app/src/main/java/me/andreww7985/connectplus/ui/FragmentName.kt
@@ -0,0 +1,5 @@
+package me.andreww7985.connectplus.ui
+
+interface FragmentName {
+    fun getName(): String
+}
diff --git a/app/src/main/java/me/andreww7985/connectplus/ui/activities/MainActivity.kt b/app/src/main/java/me/andreww7985/connectplus/ui/activities/MainActivity.kt
@@ -3,21 +3,24 @@ package me.andreww7985.connectplus.ui.activities
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import kotlinx.android.synthetic.main.activity_main.*
 import me.andreww7985.connectplus.App
 import me.andreww7985.connectplus.R
 import me.andreww7985.connectplus.dfu.DfuView
 import me.andreww7985.connectplus.helpers.UIHelper
 import me.andreww7985.connectplus.speaker.SpeakerView
-import me.andreww7985.connectplus.ui.fragments.ConnectPlusFragment
+import me.andreww7985.connectplus.ui.FragmentName
+import me.andreww7985.connectplus.ui.fragments.ConnectFragment
 import me.andreww7985.connectplus.ui.fragments.SettingsFragment
 import timber.log.Timber
 
 class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
     companion object {
         private const val KEY_SELECTED_ITEM = "selectedItem"
     }
+
     var selectedItem: Int = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,15 +50,15 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS
         nav_menu.selectedItemId = selectedItemId
 
         val fragment = when (selectedItemId) {
-            R.id.nav_dashboard -> SpeakerView()
+            R.id.nav_dashboard -> SpeakerView() as Fragment
             R.id.nav_flash_dfu -> DfuView()
             R.id.nav_settings -> SettingsFragment()
-            R.id.nav_connect -> ConnectPlusFragment()
+            R.id.nav_connect -> ConnectFragment()
             else -> throw IllegalArgumentException("Wrong selectedItemId")
         }
 
         App.analytics.logEvent("opened_menu") {
-            putString("menu_name", fragment::class.java.simpleName)
+            putString("menu_name", (fragment as FragmentName).getName())
         }
 
         UIHelper.showFragment(this, fragment)

diff --git a/app/src/main/java/me/andreww7985/connectplus/ui/fragments/ConnectFragment.kt b/app/src/main/java/me/andreww7985/connectplus/ui/fragments/ConnectFragment.kt
@@ -0,0 +1,62 @@
+package me.andreww7985.connectplus.ui.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import kotlinx.android.synthetic.main.fragment_connect.*
+import me.andreww7985.connectplus.R
+import me.andreww7985.connectplus.manager.BleScanManager
+import me.andreww7985.connectplus.manager.SpeakerManager
+import me.andreww7985.connectplus.ui.FragmentName
+import me.andreww7985.connectplus.ui.SpeakersAdapter
+
+class ConnectFragment : Fragment(), FragmentName {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_connect, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        connect_list.layoutManager = LinearLayoutManager(context)
+        connect_list.adapter = SpeakersAdapter(context!!, SpeakerManager.speakerList)
+
+        SpeakerManager.linkUpdatedEvent.subscribe {
+            this@ConnectFragment.activity?.runOnUiThread {
+                connect_list.adapter?.notifyDataSetChanged()
+            }
+        }
+
+        connect_scan_button.setOnClickListener {
+            if (BleScanManager.isScanning) {
+                BleScanManager.stopScan()
+            } else {
+                BleScanManager.startScan()
+            }
+
+            updateUi()
+        }
+
+        updateUi()
+    }
+
+    fun updateUi() {
+        if (BleScanManager.isScanning) {
+            connect_scan_progressbar.visibility = View.VISIBLE
+            connect_scan_value.text = getString(R.string.connect_searching_on)
+            connect_scan_button.text = getString(R.string.connect_button_stop)
+        } else {
+            connect_scan_progressbar.visibility = View.GONE
+            connect_scan_value.text = getString(R.string.connect_searching_off)
+            connect_scan_button.text = getString(R.string.connect_button_search)
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        SpeakerManager.speakerFoundEvent.unsubscribe()
+    }
+
+    override fun getName() = "Connect"
+}
diff --git a/app/src/main/java/me/andreww7985/connectplus/ui/fragments/ConnectPlusFragment.kt b/app/src/main/java/me/andreww7985/connectplus/ui/fragments/ConnectPlusFragment.kt
diff --git a/app/src/main/java/me/andreww7985/connectplus/ui/fragments/SettingsFragment.kt b/app/src/main/java/me/andreww7985/connectplus/ui/fragments/SettingsFragment.kt
@@ -3,13 +3,17 @@ package me.andreww7985.connectplus.ui.fragments
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat
 import me.andreww7985.connectplus.R
+import me.andreww7985.connectplus.ui.FragmentName
 
-class SettingsFragment : PreferenceFragmentCompat() {
+class SettingsFragment : PreferenceFragmentCompat(), FragmentName {
     companion object {
         const val TAG = "SettingsFragment"
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.preferences)
     }
+
+
+    override fun getName() = "Settings"
 }
diff --git a/...main/res/layout/fragment_connect_plus.xml → app/src/main/res/layout/fragment_connect.xml b/...main/res/layout/fragment_connect_plus.xml → app/src/main/res/layout/fragment_connect.xml
@@ -6,7 +6,7 @@
     android:divider="?android:attr/listDivider"
     android:orientation="vertical"
     android:showDividers="middle|end"
-    tools:context=".ui.fragments.ConnectPlusFragment">
+    tools:context=".ui.fragments.ConnectFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -19,23 +19,23 @@
         android:orientation="horizontal">
 
         <ProgressBar
+            android:id="@+id/connect_scan_progressbar"
             style="?android:attr/progressBarStyle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp" />
 
         <TextView
+            android:id="@+id/connect_scan_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
-            android:layout_weight="1"
-            android:text="Scanning..." />
+            android:layout_weight="1" />
 
         <Button
-            android:id="@+id/button"
+            android:id="@+id/connect_scan_button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Stop" />
+            android:layout_height="wrap_content" />
     </LinearLayout>
 
     <ScrollView

diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml
@@ -14,7 +14,7 @@
         <item
             android:id="@+id/nav_connect"
             android:icon="@drawable/ic_connect_plus"
-            android:title="@string/menu_connect_plus" />
+            android:title="@string/menu_connect" />
         <item
             android:id="@+id/nav_settings"
             android:icon="@drawable/ic_settings"

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -43,4 +43,13 @@
     <string name="discovery_connecting">Подключение к %1$s&#8230;</string>
     <string name="dfu_state_canceled">Отменено! Ваше устройство должно перезагрузиться прямо сейчас в нормальный режим</string>
     <string name="dashboard_speakerphone_mode">Режим громкой связи</string>
+    <string name="connect_searching_on">Поиск&#8230;</string>
+    <string name="connect_searching_off">Поиск отключен</string>
+    <string name="connect_button_search">ПОИСК</string>
+    <string name="connect_button_stop">СТОП</string>
+    <string name="settings_images_info">Все логотипы и изображения колонок принадлежат JBL</string>
+    <string name="setting_about">О приложении</string>
+    <string name="settings_source_code_title">Исходный код</string>
+    <string name="settings_source_code_summary">Нажмите чтобы открыть в браузере</string>
+    <string name="settings_app_version_title">Версия приложения</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="menu_dashboard">Dashboard</string>
     <string name="menu_refresh">Refresh</string>
     <string name="menu_flash_dfu">Flash DFU</string>
-    <string name="menu_connect_plus" translatable="false">JBL Connect+</string>
+    <string name="menu_connect" translatable="false">JBL Connect+</string>
 
     <string name="dashboard_battery_level" translatable="false">%1$d%%</string>
     <string name="dashboard_battery_level_charging">%1$d%%, charging</string>
@@ -61,4 +61,14 @@
     <string name="dfu_button_open_file">OPEN FILE</string>
     <string name="dfu_state_canceled">Canceled! Your device should reboot right now to normal mode</string>
     <string name="dashboard_speakerphone_mode">Speakerphone mode</string>
+    <string name="connect_searching_on">Searching&#8230;</string>
+    <string name="connect_searching_off">Not searching</string>
+    <string name="connect_button_search">SEARCH</string>
+    <string name="connect_button_stop">STOP</string>
+    <string name="settings_images_info">All speaker logos and images belong to JBL</string>
+    <string name="setting_about">About</string>
+    <string name="settings_source_code_title">Source code</string>
+    <string name="settings_source_code_summary">Tap to open in browser</string>
+    <string name="settings_app_version_title">App version</string>
+    <string name="settings_app_version_summary" translatable="false">1.1.2</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -24,5 +24,20 @@
             android:title="@string/settings_testers_title" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/setting_about">
+        <Preference
+            android:summary="@string/settings_source_code_summary"
+            android:title="@string/settings_source_code_title">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="https://github.com/andreww7985/connect-plus" />
+        </Preference>
+
+        <Preference
+            android:summary="@string/settings_app_version_summary"
+            android:title="@string/settings_app_version_title" />
+
+        <Preference android:summary="@string/settings_images_info" />
+    </PreferenceCategory>
 
 </PreferenceScreen>