chore: update colors and clean up some code

paug · Mar 28, 2024 · 5280321 · 5280321
1 parent 434de0a
commit 5280321
Show file tree

Hide file tree

Showing 15 changed files with 145 additions and 285 deletions.
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
-        android:name=".AndroidMakersApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:name=".AndroidMakersApplication"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/PreviewTheme.AndroidMakers"
@@ -32,12 +32,12 @@
             android:resource="@color/white" />
 
         <activity
-            android:name=".ui.MainActivity"
             android:configChanges="orientation|screenSize"
             android:exported="true"
+            android:launchMode="singleTask"
+            android:name=".MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AndroidMakers.NoActionBar"
-            android:launchMode="singleTask"
             tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -46,9 +46,9 @@
         </activity>
 
         <service
-            android:name=".messaging.AndroidMakersMessagingService"
             android:directBootAware="true"
-            android:exported="false">
+            android:exported="false"
+            android:name=".messaging.AndroidMakersMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

diff --git a/androidApp/src/main/java/fr/paug/androidmakers/AndroidMakersApplication.kt b/androidApp/src/main/java/fr/paug/androidmakers/AndroidMakersApplication.kt
@@ -11,7 +11,10 @@ class AndroidMakersApplication : Application() {
     super.onCreate()
 
     DependenciesBuilder(this).inject(
-        listOf(androidViewModelModule, viewModelModule)
+      listOf(
+        androidViewModelModule,
+        viewModelModule
+      )
     )
   }
 }
diff --git a/.../fr/paug/androidmakers/ui/MainActivity.kt → ...ava/fr/paug/androidmakers/MainActivity.kt b/.../fr/paug/androidmakers/ui/MainActivity.kt → ...ava/fr/paug/androidmakers/MainActivity.kt
@@ -1,4 +1,4 @@
-package fr.paug.androidmakers.ui
+package fr.paug.androidmakers
 
 import android.content.Intent
 import android.graphics.Color
@@ -29,7 +29,6 @@ import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.auth.GoogleAuthProvider
 import dev.gitlive.firebase.auth.auth
 import fr.androidmakers.store.firebase.toUser
-import fr.paug.androidmakers.BuildConfig
 import fr.paug.androidmakers.R
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -44,7 +43,6 @@ class MainActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
 
     WindowCompat.setDecorFitsSystemWindows(window, false)
-    enableEdgeToEdge()
 
     logFCMToken()
 
@@ -55,28 +53,28 @@ class MainActivity : AppCompatActivity() {
       val darkTheme = isSystemInDarkTheme()
 
       CompositionLocalProvider(
-          LocalPlatformContext provides rememberedActivity,
+        LocalPlatformContext provides rememberedActivity,
       ) {
         KoinContext {
           AndroidMakersTheme {
             DisposableEffect(darkTheme) {
               enableEdgeToEdge(
-                  statusBarStyle = SystemBarStyle.auto(
-                      Color.TRANSPARENT,
-                      Color.TRANSPARENT,
-                  ) { darkTheme },
-                  navigationBarStyle = SystemBarStyle.auto(
-                      Color.TRANSPARENT,
-                      Color.TRANSPARENT,
-                  ) { darkTheme },
+                statusBarStyle = SystemBarStyle.auto(
+                  Color.TRANSPARENT,
+                  Color.TRANSPARENT,
+                ) { darkTheme },
+                navigationBarStyle = SystemBarStyle.auto(
+                  Color.TRANSPARENT,
+                  Color.TRANSPARENT,
+                ) { darkTheme },
               )
               onDispose { }
             }
 
             MainLayout(
-                user = userState.value,
-                versionName = BuildConfig.VERSION_NAME,
-                versionCode = BuildConfig.VERSION_CODE.toString(),
+              user = userState.value,
+              versionName = BuildConfig.VERSION_NAME,
+              versionCode = BuildConfig.VERSION_CODE.toString(),
             )
           }
         }
@@ -101,7 +99,7 @@ class MainActivity : AppCompatActivity() {
     when (requestCode) {
       REQ_SIGNIN -> {
         val task: Task<GoogleSignInAccount> =
-            GoogleSignIn.getSignedInAccountFromIntent(data)
+          GoogleSignIn.getSignedInAccountFromIntent(data)
         try {
           val account: GoogleSignInAccount = task.getResult(ApiException::class.java)
           val idToken = account.idToken
@@ -136,8 +134,8 @@ class MainActivity : AppCompatActivity() {
   fun signout() {
     val activity = this
     val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-        .requestIdToken(activity.getString(R.string.default_web_client_id))
-        .build()
+      .requestIdToken(activity.getString(R.string.default_web_client_id))
+      .build()
     val googleSignInClient = GoogleSignIn.getClient(activity, gso)
 
     lifecycleScope.launch {
@@ -151,8 +149,8 @@ class MainActivity : AppCompatActivity() {
   fun signin() {
     val activity = this
     val gso = GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
-        .requestIdToken(activity.getString(R.string.default_web_client_id))
-        .build()
+      .requestIdToken(activity.getString(R.string.default_web_client_id))
+      .build()
     val googleSignInClient = GoogleSignIn.getClient(activity, gso)
 
     activity.startActivityForResult(googleSignInClient.signInIntent, REQ_SIGNIN)

diff --git a/...androidmakers/ui/MainActivityViewModel.kt → ...ug/androidmakers/MainActivityViewModel.kt b/...androidmakers/ui/MainActivityViewModel.kt → ...ug/androidmakers/MainActivityViewModel.kt
@@ -1,4 +1,4 @@
-package fr.paug.androidmakers.ui
+package fr.paug.androidmakers
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -13,7 +13,7 @@ class MainActivityViewModel(
   private val userRepository: UserRepository,
   val syncBookmarksUseCase: SyncBookmarksUseCase
 
-): ViewModel() {
+) : ViewModel() {
   private val _user = MutableStateFlow<User?>(null)
   val user: Flow<User?> = _user
 
@@ -23,9 +23,9 @@ class MainActivityViewModel(
 
       val currentUser = _user.value
       if (currentUser != null) {
-          // fire & forget
-          // This is racy but oh well...
-          syncBookmarksUseCase(currentUser.id)
+        // fire & forget
+        // This is racy but oh well...
+        syncBookmarksUseCase(currentUser.id)
       }
     }
   }

diff --git a/androidApp/src/main/java/fr/paug/androidmakers/di/ViewModelModule.kt b/androidApp/src/main/java/fr/paug/androidmakers/di/ViewModelModule.kt
@@ -1,6 +1,6 @@
 package fr.paug.androidmakers.di
 
-import fr.paug.androidmakers.ui.MainActivityViewModel
+import fr.paug.androidmakers.MainActivityViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 

diff --git a/androidApp/src/main/java/fr/paug/androidmakers/messaging/AndroidMakersMessagingService.kt b/androidApp/src/main/java/fr/paug/androidmakers/messaging/AndroidMakersMessagingService.kt
@@ -11,8 +11,8 @@ import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import fr.paug.androidmakers.MainActivity
 import fr.paug.androidmakers.R
-import fr.paug.androidmakers.ui.MainActivity
 
 class AndroidMakersMessagingService : FirebaseMessagingService() {
 
@@ -45,26 +45,30 @@ class AndroidMakersMessagingService : FirebaseMessagingService() {
   private fun sendNotification(messageBody: String) {
     val intent = Intent(this, MainActivity::class.java)
     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-    val pendingIntent = PendingIntent.getActivity(this, 0 /* Request code */, intent,
-        PendingIntent.FLAG_IMMUTABLE)
+    val pendingIntent = PendingIntent.getActivity(
+      this, 0 /* Request code */, intent,
+      PendingIntent.FLAG_IMMUTABLE
+    )
 
     val channelId = "fcm_default_channel"
     val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
     val notificationBuilder = NotificationCompat.Builder(this, channelId)
-        .setContentTitle("FCM Message")
-        .setContentText(messageBody)
-        .setSmallIcon(R.drawable.ic_notification_small)
-        .setAutoCancel(true)
-        .setSound(defaultSoundUri)
-        .setContentIntent(pendingIntent)
+      .setContentTitle("FCM Message")
+      .setContentText(messageBody)
+      .setSmallIcon(R.drawable.ic_notification_small)
+      .setAutoCancel(true)
+      .setSound(defaultSoundUri)
+      .setContentIntent(pendingIntent)
 
     val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
     // Since android Oreo notification channel is needed.
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val channel = NotificationChannel(channelId,
-          "Channel human readable title",
-          NotificationManager.IMPORTANCE_DEFAULT)
+      val channel = NotificationChannel(
+        channelId,
+        "Channel human readable title",
+        NotificationManager.IMPORTANCE_DEFAULT
+      )
       notificationManager.createNotificationChannel(channel)
     }
 

diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/ShowRationalPermissionDialog.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/ShowRationalPermissionDialog.kt
diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/SigninButton.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/SigninButton.kt
diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/util/ResourcesUtils.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/util/ResourcesUtils.kt