Add Widget Settings, Move Widget, Split out Login (#53)

- Split Login to Package
- Move Widget to Package
- Update WidgetStyle
- Add WidgetConfiguration Activity
- Update WidgetProvider for Configuration

Author: smashedr

README.md

@@ -124,6 +124,10 @@ For more planned features you can check out the internal [TODO.md](TODO.md).
 
 This section briefly covers running and building in [Android Studio](#Android-Studio) and the [Command Line](#Command-Line).
 
+> [!NOTE]  
+> Building requires an `app/google-services.json` file.
+> See [Google Services](#Google-Services) for more info...
+
 ## Android Studio
 
 1. Download and Install Android Studio.
@@ -218,6 +222,30 @@ _Note: you may have to uninstall before installing due to different certificate
 
 For more details, see the [ADB Documentation](https://developer.android.com/tools/adb#move).
 
+## Google Services
+
+This app uses Firebase Google Services. Building requires a valid `google-services.json` file in the `app` directory.  
+You must add `com.djangofiles.djangofiles.dev` to a Firebase campaign here: https://firebase.google.com/
+
+To enable/disable Firebase DebugView use the following commands:
+
+```shell
+# set
+adb shell setprop debug.firebase.analytics.app com.djangofiles.djangofiles.dev
+
+# unset
+adb shell setprop debug.firebase.analytics.app .none.
+
+# check
+adb shell getprop debug.firebase.analytics.app
+```
+
+Only 1 app can be in debug mode at a time and this must be set every restart.
+
+> [!NOTE]  
+> Note: To disable/enable Analytics or Crashlytics set the `manifestPlaceholders`
+> in the [build.gradle.kts](app/build.gradle.kts) file to the respective values.
+
 # Support
 
 For general help or to request a feature, see:

app/build.gradle.kts

@@ -25,6 +25,8 @@ android {
         versionName = "0.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        manifestPlaceholders["firebaseAnalyticsDeactivated"] = false
+        manifestPlaceholders["firebaseCrashlyticsEnabled"] = true
     }
 
     buildTypes {
@@ -35,13 +37,13 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            manifestPlaceholders["firebaseAnalyticsDeactivated"] = false
         }
 
         debug {
             applicationIdSuffix = ".dev"
             versionNameSuffix = "-dev"
-            manifestPlaceholders["firebaseAnalyticsDeactivated"] = false
+            manifestPlaceholders["firebaseAnalyticsDeactivated"] = true
+            manifestPlaceholders["firebaseCrashlyticsEnabled"] = false
 
             // Debugging Only
             val localProperties = Properties().apply {

app/src/main/AndroidManifest.xml

@@ -70,8 +70,19 @@
         <meta-data
             android:name="firebase_analytics_collection_deactivated"
             android:value="${firebaseAnalyticsDeactivated}" />
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="${firebaseCrashlyticsEnabled}" />
 
-        <receiver android:name="WidgetProvider"
+        <activity android:name=".widget.WidgetConfiguration"
+            android:theme="@style/Theme.WidgetConfig.Transparent"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+            </intent-filter>
+        </activity>
+        
+        <receiver android:name=".widget.WidgetProvider"
             android:exported="false">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

app/src/main/java/com/djangofiles/djangofiles/DailyWorker.kt

@@ -11,6 +11,7 @@ import com.djangofiles.djangofiles.db.Server
 import com.djangofiles.djangofiles.db.ServerDao
 import com.djangofiles.djangofiles.db.ServerDatabase
 import com.djangofiles.djangofiles.ui.files.getAlbums
+import com.djangofiles.djangofiles.widget.WidgetProvider
 
 class DailyWorker(appContext: Context, workerParams: WorkerParameters) :
     CoroutineWorker(appContext, workerParams) {
@@ -51,7 +52,7 @@ class DailyWorker(appContext: Context, workerParams: WorkerParameters) :
         Log.d("DailyWorker", "componentName: $componentName")
         val intent = Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE).setClassName(
             applicationContext.packageName,
-            "com.djangofiles.djangofiles.WidgetProvider"
+            "com.djangofiles.djangofiles.widget.WidgetProvider"
         ).apply {
             val ids =
                 AppWidgetManager.getInstance(applicationContext).getAppWidgetIds(componentName)

app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt

@@ -47,6 +47,7 @@ import com.djangofiles.djangofiles.db.Server
 import com.djangofiles.djangofiles.db.ServerDao
 import com.djangofiles.djangofiles.db.ServerDatabase
 import com.djangofiles.djangofiles.ui.home.HomeViewModel
+import com.djangofiles.djangofiles.widget.WidgetProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -234,9 +235,9 @@ class MainActivity : AppCompatActivity() {
             } else {
                 val handled = NavigationUI.onNavDestinationSelected(menuItem, navController)
                 Log.d("Drawer", "ELSE - handled: $handled")
-                if (handled) {
-                    binding.drawerLayout.closeDrawers()
-                }
+                //if (handled) {
+                binding.drawerLayout.closeDrawers()
+                //}
                 handled
             }
         }

app/src/main/java/com/djangofiles/djangofiles/ui/settings/AuthorizeFragment.kt renamed to app/src/main/java/com/djangofiles/djangofiles/ui/login/AuthorizeFragment.kt

@@ -1,4 +1,4 @@
-package com.djangofiles.djangofiles.ui.settings
+package com.djangofiles.djangofiles.ui.login
 
 import android.content.Context
 import android.content.Context.MODE_PRIVATE

app/src/main/java/com/djangofiles/djangofiles/ui/settings/LoginFragment.kt renamed to app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginFragment.kt

@@ -1,4 +1,4 @@
-package com.djangofiles.djangofiles.ui.settings
+package com.djangofiles.djangofiles.ui.login
 
 import android.content.Intent
 import android.os.Bundle
@@ -25,8 +25,8 @@ class LoginFragment : Fragment() {
     private var _binding: FragmentLoginBinding? = null
     private val binding get() = _binding!!
 
-    //private val viewModel: SettingsViewModel by viewModels()
-    private val viewModel: SettingsViewModel by activityViewModels()
+    //private val viewModel: LoginViewModel by viewModels()
+    private val viewModel: LoginViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/djangofiles/djangofiles/ui/settings/LoginTwoFragment.kt renamed to app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginTwoFragment.kt

@@ -1,4 +1,4 @@
-package com.djangofiles.djangofiles.ui.settings
+package com.djangofiles.djangofiles.ui.login
 
 import android.content.Context.MODE_PRIVATE
 import android.content.Intent
@@ -36,8 +36,8 @@ class LoginTwoFragment : Fragment() {
     private var _binding: FragmentLoginTwoBinding? = null
     private val binding get() = _binding!!
 
-    //private val viewModel: SettingsViewModel by viewModels()
-    private val viewModel: SettingsViewModel by activityViewModels()
+    //private val viewModel: LoginViewModel by viewModels()
+    private val viewModel: LoginViewModel by activityViewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsViewModel.kt renamed to app/src/main/java/com/djangofiles/djangofiles/ui/login/LoginViewModel.kt

@@ -1,12 +1,12 @@
-package com.djangofiles.djangofiles.ui.settings
+package com.djangofiles.djangofiles.ui.login
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.djangofiles.djangofiles.ServerApi
 
 //import androidx.databinding.Bindable
 
-class SettingsViewModel : ViewModel() {
+class LoginViewModel : ViewModel() {
     val hostname = MutableLiveData<String>()
     val siteName = MutableLiveData<String>()
     val authMethods = MutableLiveData<List<ServerApi.Methods>>()

app/src/main/java/com/djangofiles/djangofiles/ui/settings/SettingsFragment.kt

@@ -154,6 +154,23 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
         buildServerList()
 
+        // Widget Settings
+        findPreference<Preference>("open_widget_settings")?.setOnPreferenceClickListener {
+            Log.d("open_widget_settings", "setOnPreferenceClickListener")
+            findNavController().navigate(R.id.nav_item_settings_action_widget)
+            //findNavController().navigate(
+            //    R.id.nav_item_settings_action_widget,
+            //    null,
+            //    NavOptions.Builder()
+            //        .setEnterAnim(R.anim.slide_in_left)
+            //        .setExitAnim(R.anim.slide_out_left)
+            //        .setPopEnterAnim(R.anim.slide_in_right)
+            //        .setPopExitAnim(R.anim.slide_out_right)
+            //        .build()
+            //)
+            false
+        }
+
         // Toggle Analytics
         val toggleAnalytics = findPreference<SwitchPreferenceCompat>("analytics_enabled")
         toggleAnalytics?.setOnPreferenceChangeListener { _, newValue ->
@@ -308,11 +325,11 @@ class SettingsFragment : PreferenceFragmentCompat() {
                             "Feedback Sent. Thank You!"
                         } else {
                             sendButton.isEnabled = true
-                            //val params = Bundle().apply {
-                            //    putString("message", response.message())
-                            //    putString("code", response.code().toString())
-                            //}
-                            //Firebase.analytics.logEvent("feedback_failed", params)
+                            val params = Bundle().apply {
+                                putString("message", response.message())
+                                putString("code", response.code().toString())
+                            }
+                            Firebase.analytics.logEvent("send_feedback_failed", params)
                             "Error: ${response.code()}"
                         }
                         Log.d("showFeedbackDialog", "msg: $msg")