Merge pull request #221 from metabrainz/refactor

Refactor entire codebase
metabrainz · Apr 27, 2023 · 8a540f0 · 8a540f0
2 parents 94f20a6 + a622004
commit 8a540f0
Show file tree

Hide file tree

Showing 224 changed files with 856 additions and 1,596 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,6 +8,8 @@ plugins {
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 
 android {
+    namespace 'org.metabrainz.android'
+
     compileSdk 33
     signingConfigs {
         release {
@@ -69,11 +71,9 @@ android {
         abortOnError false
         disable 'MissingTranslation'
     }
-
     composeOptions {
         kotlinCompilerExtensionVersion '1.3.0'
     }
-    namespace 'org.metabrainz.android'
 }
 
 dependencies {

diff --git a/app/src/androidTest/java/org/metabrainz/android/LoginActivityTest.kt b/app/src/androidTest/java/org/metabrainz/android/LoginActivityTest.kt
@@ -15,8 +15,8 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.metabrainz.android.data.sources.api.MusicBrainzServiceGenerator
-import org.metabrainz.android.presentation.features.login.LoginActivity
+import org.metabrainz.android.service.MusicBrainzServiceGenerator
+import org.metabrainz.android.ui.screens.login.LoginActivity
 
 @RunWith(AndroidJUnit4ClassRunner::class)
 class LoginActivityTest {
@@ -35,7 +35,8 @@ class LoginActivityTest {
     fun testLoginAuthorization() {
         Espresso.onView(ViewMatchers.withId(R.id.login_btn)).perform(ViewActions.click())
         Intents.intended(AllOf.allOf(IntentMatchers.hasAction(Intent.ACTION_VIEW),
-                IntentMatchers.hasData(Uri.parse(MusicBrainzServiceGenerator.AUTH_BASE_URL
+                IntentMatchers.hasData(Uri.parse(
+                    MusicBrainzServiceGenerator.AUTH_BASE_URL
                         + "authorize"
                         + "?response_type=code"
                         + "&client_id=" + MusicBrainzServiceGenerator.CLIENT_ID

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -10,30 +15,20 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:name=".App"
-        android:autoRevokePermissions="allowed"
+        android:name=".application.App"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:targetApi="33">
-        <service
-            android:name=".presentation.features.listens.ListenService"
-            android:enabled="true"
-            android:exported="true"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
-            </intent-filter>
-        </service>
 
         <activity
-            android:name=".presentation.features.onboarding.FeaturesActivity"
+            android:name=".ui.screens.onboarding.FeaturesActivity"
             android:theme="@style/AppThemeNoActionBar" />
         <activity
-            android:name=".presentation.features.dashboard.DashboardActivity"
+            android:name=".ui.screens.dashboard.DashboardActivity"
             android:theme="@style/Theme.App.Starting"
             android:exported="true">
             <intent-filter>
@@ -42,27 +37,27 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".presentation.features.collection.CollectionDetailsActivity"
+            android:name=".ui.screens.collection.CollectionDetailsActivity"
             android:label="Collection"
-            android:parentActivityName="org.metabrainz.android.presentation.features.collection.CollectionActivity">
+            android:parentActivityName=".ui.screens.collection.CollectionActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".presentation.features.collection.CollectionActivity" />
+                android:value=".ui.screens.collection.CollectionActivity" />
         </activity>
         <activity
-            android:name="org.metabrainz.android.presentation.features.collection.CollectionActivity"
+            android:name=".ui.screens.collection.CollectionActivity"
             android:label="@string/dash_collections" />
         <activity
-            android:name=".presentation.features.recording.RecordingActivity"
+            android:name=".ui.screens.recording.RecordingActivity"
             android:label="@string/search_type_recording" />
         <activity
-            android:name=".presentation.features.label.LabelActivity"
+            android:name=".ui.screens.label.LabelActivity"
             android:label="@string/search_type_label" />
         <activity
-            android:name=".presentation.features.release_group.ReleaseGroupActivity"
+            android:name=".ui.screens.release_group.ReleaseGroupActivity"
             android:label="@string/search_type_release_group" />
         <activity
-            android:name=".presentation.features.search.SearchActivity"
+            android:name=".ui.screens.search.SearchActivity"
             android:label="@string/settings_search"
             android:launchMode="singleTop"
             android:windowSoftInputMode="stateHidden">
@@ -71,7 +66,7 @@
                 android:resource="@xml/searchable" />
         </activity>
         <activity
-            android:name=".presentation.features.login.LoginActivity"
+            android:name=".ui.screens.login.LoginActivity"
             android:label="@string/auth_title"
             android:exported="true">
             <intent-filter>
@@ -86,26 +81,25 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".presentation.features.about.AboutActivity"
+            android:name=".ui.screens.about.AboutActivity"
             android:label="@string/about_title" />
         <activity
-            android:name=".presentation.features.dashboard.DonateActivity"
+            android:name=".ui.screens.dashboard.DonateActivity"
             android:label="@string/donate_title" />
         <activity
-            android:name="org.metabrainz.android.presentation.features.release.ReleaseActivity"
+            android:name="org.metabrainz.android.ui.screens.release.ReleaseActivity"
             android:label="@string/release_title" />
         <activity
-            android:name="org.metabrainz.android.presentation.features.artist.ArtistActivity"
+            android:name=".ui.screens.artist.ArtistActivity"
             android:label="@string/artist_title" />
         <activity
-            android:name="org.metabrainz.android.presentation.features.settings.SettingsActivity"
+            android:name=".ui.screens.settings.SettingsActivity"
             android:label="@string/preferences_title" />
 
-        <activity android:name=".presentation.features.barcode.BarcodeActivity" />
+        <activity android:name=".ui.screens.barcode.BarcodeActivity" />
 
-        <activity
-            android:name="org.metabrainz.android.presentation.features.barcode.BarcodeResultActivity" />
-        <activity android:name=".presentation.features.newsbrainz.NewsBrainzActivity" />
+        <activity android:name=".ui.screens.barcode.BarcodeResultActivity" />
+        <activity android:name=".ui.screens.newsbrainz.NewsBrainzActivity" />
 
         <meta-data
             android:name="android.app.default_searchable"
@@ -115,7 +109,7 @@
             android:value="AEdPqrEAAAAIJeBCYRRcklJ4Px20MnlwsLTD9Rpp6eQyjiVNRg" />
 
         <provider
-            android:name="org.metabrainz.android.presentation.features.suggestion.SuggestionProvider"
+            android:name="org.metabrainz.android.ui.screens.suggestion.SuggestionProvider"
             android:authorities="${applicationId}.SearchSuggestionProvider"
             android:exported="false" />
 

diff --git a/...c/main/java/org/metabrainz/android/App.kt → ...org/metabrainz/android/application/App.kt b/...c/main/java/org/metabrainz/android/App.kt → ...org/metabrainz/android/application/App.kt
@@ -1,18 +1,15 @@
-package org.metabrainz.android
+package org.metabrainz.android.application
 
 import android.app.Application
 import android.content.Context
-import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Typeface
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.os.Build
 import android.provider.Settings
 import dagger.hilt.android.HiltAndroidApp
-import org.metabrainz.android.presentation.Configuration
-import org.metabrainz.android.presentation.UserPreferences.preferenceListeningEnabled
-import org.metabrainz.android.presentation.features.listens.ListenService
+import org.metabrainz.android.util.Configuration
 
 @HiltAndroidApp
 class App : Application() {
@@ -21,23 +18,12 @@ class App : Application() {
         super.onCreate()
         context = this
         loadCustomTypefaces()
-        if (preferenceListeningEnabled && Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) startListenService()
     }
 
     private fun loadCustomTypefaces() {
         robotoLight = Typeface.createFromAsset(context!!.assets, "Roboto-Light.ttf")
     }
 
-    fun startListenService() {
-        val intent = Intent(this.applicationContext, ListenService::class.java)
-        startService(intent)
-    }
-
-    fun stopListenService() {
-        val intent = Intent(this.applicationContext, ListenService::class.java)
-        stopService(intent)
-    }
-
     val isNotificationServiceAllowed: Boolean
         get() {
             val listeners = Settings.Secure.getString(contentResolver, "enabled_notification_listeners")

diff --git a/app/src/main/java/org/metabrainz/android/data/dao/AlbumDao.kt b/app/src/main/java/org/metabrainz/android/data/dao/AlbumDao.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/dao/ArtistDao.kt b/app/src/main/java/org/metabrainz/android/data/dao/ArtistDao.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/dao/PlaylistDao.kt b/app/src/main/java/org/metabrainz/android/data/dao/PlaylistDao.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/dao/SongDao.kt b/app/src/main/java/org/metabrainz/android/data/dao/SongDao.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/di/ListensRepositoryModule.kt b/app/src/main/java/org/metabrainz/android/data/di/ListensRepositoryModule.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/repository/BlogRepository.kt b/app/src/main/java/org/metabrainz/android/data/repository/BlogRepository.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/repository/ListensRepository.kt b/app/src/main/java/org/metabrainz/android/data/repository/ListensRepository.kt
diff --git a/app/src/main/java/org/metabrainz/android/data/repository/ListensRepositoryImpl.kt b/app/src/main/java/org/metabrainz/android/data/repository/ListensRepositoryImpl.kt