From c74a217f9c19f94ceebd0697efbcdb1b04a20956 Mon Sep 17 00:00:00 2001 From: Josh Leibstein Date: Tue, 7 Nov 2023 11:57:10 +0000 Subject: [PATCH] Standardize macos namespace --- macos/macos-impl/build.gradle | 2 +- macos/macos-impl/src/main/AndroidManifest.xml | 4 ++-- .../impl}/MacOsActivity.kt | 19 ++++++++++--------- .../impl}/MacOsLinkShareBroadcastReceiver.kt | 6 +++--- .../impl}/MacOsPixelNames.kt | 2 +- .../impl}/MacOsViewModel.kt | 10 +++++----- .../src/main/res/layout/activity_macos.xml | 2 +- .../ui => macos/impl}/MacOsViewModelTest.kt | 11 +++++------ 8 files changed, 28 insertions(+), 28 deletions(-) rename macos/macos-impl/src/main/java/com/duckduckgo/{macos_impl => macos/impl}/MacOsActivity.kt (86%) rename macos/macos-impl/src/main/java/com/duckduckgo/{macos_impl => macos/impl}/MacOsLinkShareBroadcastReceiver.kt (90%) rename macos/macos-impl/src/main/java/com/duckduckgo/{macos_impl => macos/impl}/MacOsPixelNames.kt (96%) rename macos/macos-impl/src/main/java/com/duckduckgo/{macos_impl => macos/impl}/MacOsViewModel.kt (87%) rename macos/macos-impl/src/test/java/com/duckduckgo/{macos_impl/waitlist/ui => macos/impl}/MacOsViewModelTest.kt (86%) diff --git a/macos/macos-impl/build.gradle b/macos/macos-impl/build.gradle index 1db53847ee83..42a68f83602b 100644 --- a/macos/macos-impl/build.gradle +++ b/macos/macos-impl/build.gradle @@ -23,7 +23,7 @@ plugins { apply from: "$rootProject.projectDir/gradle/android-library.gradle" android { - namespace 'com.duckduckgo.macos_impl' + namespace 'com.duckduckgo.macos.impl' } dependencies { diff --git a/macos/macos-impl/src/main/AndroidManifest.xml b/macos/macos-impl/src/main/AndroidManifest.xml index c54d4aa07216..84d16cbb7846 100644 --- a/macos/macos-impl/src/main/AndroidManifest.xml +++ b/macos/macos-impl/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ --> + package="com.duckduckgo.macos.impl"> \ No newline at end of file diff --git a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsActivity.kt b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsActivity.kt similarity index 86% rename from macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsActivity.kt rename to macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsActivity.kt index 2a329c5545aa..0711262faa75 100644 --- a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsActivity.kt +++ b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 DuckDuckGo + * Copyright (c) 2023 DuckDuckGo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.duckduckgo.macos_impl +package com.duckduckgo.macos.impl import android.annotation.SuppressLint import android.app.PendingIntent @@ -29,10 +29,11 @@ import com.duckduckgo.anvil.annotations.InjectWith import com.duckduckgo.app.global.DuckDuckGoActivity import com.duckduckgo.di.scopes.ActivityScope import com.duckduckgo.macos.api.MacOsScreenWithEmptyParams -import com.duckduckgo.macos_impl.MacOsViewModel.Command -import com.duckduckgo.macos_impl.MacOsViewModel.Command.GoToWindowsClientSettings -import com.duckduckgo.macos_impl.MacOsViewModel.Command.ShareLink -import com.duckduckgo.macos_impl.databinding.ActivityMacosBinding +import com.duckduckgo.macos.impl.MacOsViewModel.Command +import com.duckduckgo.macos.impl.MacOsViewModel.Command.GoToWindowsClientSettings +import com.duckduckgo.macos.impl.MacOsViewModel.Command.ShareLink +import com.duckduckgo.macos.impl.R.string +import com.duckduckgo.macos.impl.databinding.ActivityMacosBinding import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding import com.duckduckgo.navigation.api.GlobalActivityStarter import com.duckduckgo.windows.api.ui.WindowsScreenWithEmptyParams @@ -90,8 +91,8 @@ class MacOsActivity : DuckDuckGoActivity() { private fun launchSharePageChooser() { val share = Intent(Intent.ACTION_SEND).apply { type = "text/html" - putExtra(Intent.EXTRA_TEXT, getString(R.string.macos_share_text)) - putExtra(Intent.EXTRA_TITLE, getString(R.string.macos_share_title)) + putExtra(Intent.EXTRA_TEXT, getString(string.macos_share_text)) + putExtra(Intent.EXTRA_TITLE, getString(string.macos_share_title)) } val pi = PendingIntent.getBroadcast( @@ -101,7 +102,7 @@ class MacOsActivity : DuckDuckGoActivity() { PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE, ) try { - startActivity(Intent.createChooser(share, getString(R.string.macos_share_title), pi.intentSender)) + startActivity(Intent.createChooser(share, getString(string.macos_share_title), pi.intentSender)) } catch (e: ActivityNotFoundException) { Timber.w(e, "Activity not found") } diff --git a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsLinkShareBroadcastReceiver.kt b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsLinkShareBroadcastReceiver.kt similarity index 90% rename from macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsLinkShareBroadcastReceiver.kt rename to macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsLinkShareBroadcastReceiver.kt index ef40e72616c0..cc81a60a2784 100644 --- a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsLinkShareBroadcastReceiver.kt +++ b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsLinkShareBroadcastReceiver.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 DuckDuckGo + * Copyright (c) 2023 DuckDuckGo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.duckduckgo.macos_impl +package com.duckduckgo.macos.impl import android.content.BroadcastReceiver import android.content.Context @@ -22,7 +22,7 @@ import android.content.Intent import com.duckduckgo.anvil.annotations.InjectWith import com.duckduckgo.app.statistics.pixels.Pixel import com.duckduckgo.di.scopes.ReceiverScope -import com.duckduckgo.macos_impl.MacOsPixelNames.MACOS_WAITLIST_SHARE_SHARED +import com.duckduckgo.macos.impl.MacOsPixelNames.MACOS_WAITLIST_SHARE_SHARED import dagger.android.AndroidInjection import javax.inject.Inject diff --git a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsPixelNames.kt b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsPixelNames.kt similarity index 96% rename from macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsPixelNames.kt rename to macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsPixelNames.kt index c4951ad85211..3497dbaf84be 100644 --- a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsPixelNames.kt +++ b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsPixelNames.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.duckduckgo.macos_impl +package com.duckduckgo.macos.impl import com.duckduckgo.app.statistics.pixels.Pixel diff --git a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsViewModel.kt b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsViewModel.kt similarity index 87% rename from macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsViewModel.kt rename to macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsViewModel.kt index 4ac999211aa5..85ca66521571 100644 --- a/macos/macos-impl/src/main/java/com/duckduckgo/macos_impl/MacOsViewModel.kt +++ b/macos/macos-impl/src/main/java/com/duckduckgo/macos/impl/MacOsViewModel.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 DuckDuckGo + * Copyright (c) 2023 DuckDuckGo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.duckduckgo.macos_impl +package com.duckduckgo.macos.impl import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.duckduckgo.anvil.annotations.ContributesViewModel import com.duckduckgo.app.statistics.pixels.Pixel import com.duckduckgo.di.scopes.AppScope -import com.duckduckgo.macos_impl.MacOsPixelNames.MACOS_WAITLIST_SHARE_PRESSED -import com.duckduckgo.macos_impl.MacOsViewModel.Command.GoToWindowsClientSettings -import com.duckduckgo.macos_impl.MacOsViewModel.Command.ShareLink +import com.duckduckgo.macos.impl.MacOsPixelNames.MACOS_WAITLIST_SHARE_PRESSED +import com.duckduckgo.macos.impl.MacOsViewModel.Command.GoToWindowsClientSettings +import com.duckduckgo.macos.impl.MacOsViewModel.Command.ShareLink import javax.inject.Inject import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.Channel diff --git a/macos/macos-impl/src/main/res/layout/activity_macos.xml b/macos/macos-impl/src/main/res/layout/activity_macos.xml index afc02dc7dd6b..9dd599182314 100644 --- a/macos/macos-impl/src/main/res/layout/activity_macos.xml +++ b/macos/macos-impl/src/main/res/layout/activity_macos.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".MacOsActivity"> + tools:context="com.duckduckgo.macos.impl.MacOsActivity">