Merge branch 'main' into release

app/build.gradle.kts

@@ -53,8 +53,8 @@ android {
  applicationId = project.namespace
  minSdk = libs.versions.android.sdk.min.get().toInt()
  targetSdk = libs.versions.android.sdk.target.get().toInt()
- versionCode = 2
- versionName = "0.1.1"
+ versionCode = 3
+ versionName = "v0.2"
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  }
 

app/src/androidTest/java/com/jeanbarrossilva/orca/app/OrcaActivityTests.kt

@@ -16,6 +16,7 @@
 package com.jeanbarrossilva.orca.app
 
 import androidx.test.core.app.launchActivity
+import com.jeanbarrossilva.orca.app.activity.OrcaActivity
 import com.jeanbarrossilva.orca.core.mastodon.auth.authorization.MastodonAuthorizationActivity
 import com.jeanbarrossilva.orca.ext.intents.intendStartingOf
 import org.junit.Test

app/src/demo/java/com/jeanbarrossilva/orca/app/demo/DemoOrcaActivity.kt

@@ -15,7 +15,7 @@
 
 package com.jeanbarrossilva.orca.app.demo
 
-import com.jeanbarrossilva.orca.app.OrcaActivity
+import com.jeanbarrossilva.orca.app.activity.OrcaActivity
 import com.jeanbarrossilva.orca.app.demo.module.core.DemoCoreModule
 
 internal open class DemoOrcaActivity : OrcaActivity() {

app/src/demo/java/com/jeanbarrossilva/orca/app/demo/module/core/DemoCoreModule.kt

@@ -18,10 +18,11 @@ package com.jeanbarrossilva.orca.app.demo.module.core
 import com.jeanbarrossilva.orca.core.instance.InstanceProvider
 import com.jeanbarrossilva.orca.core.module.CoreModule
 import com.jeanbarrossilva.orca.core.sample.feed.profile.post.content.SampleTermMuter
+import com.jeanbarrossilva.orca.std.injector.module.injection.injectionOf
 
 internal object DemoCoreModule :
  CoreModule(
- { InstanceProvider.sample },
- { InstanceProvider.sample.provide().authenticationLock },
- { SampleTermMuter() }
+ injectionOf { InstanceProvider.sample },
+ injectionOf { InstanceProvider.sample.provide().authenticationLock },
+ injectionOf { SampleTermMuter() }
  )

app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
  android:supportsRtl="true"
  android:theme="@style/Theme.Autos">
  <activity
- android:name="com.jeanbarrossilva.orca.app.OrcaActivity"
+ android:name=".activity.OrcaActivity"
  android:exported="true"
  android:windowSoftInputMode="adjustResize">
  <intent-filter>

app/src/main/java/com/jeanbarrossilva/orca/app/activity/OrcaActivity.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2023-2024 Orca
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If
+ * not, see https://www.gnu.org/licenses.
+ */
+
+package com.jeanbarrossilva.orca.app.activity
+
+import android.os.Bundle
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.core.view.WindowCompat
+import com.jeanbarrossilva.orca.app.activity.delegate.BottomNavigation
+import com.jeanbarrossilva.orca.app.activity.delegate.BottomNavigationViewAvailability
+import com.jeanbarrossilva.orca.app.activity.delegate.Injection
+import com.jeanbarrossilva.orca.app.databinding.ActivityOrcaBinding
+import com.jeanbarrossilva.orca.app.module.core.MainMastodonCoreModule
+import com.jeanbarrossilva.orca.core.module.CoreModule
+import com.jeanbarrossilva.orca.platform.ui.core.navigation.NavigationActivity
+
+open class OrcaActivity :
+ NavigationActivity(), BottomNavigationViewAvailability, Injection, BottomNavigation {
+ protected open val coreModule: CoreModule = MainMastodonCoreModule
+
+ override var binding: ActivityOrcaBinding? = null
+ override var constraintSet: ConstraintSet? = null
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ WindowCompat.setDecorFitsSystemWindows(window, false)
+ bindView(this)
+ offsetOnChange(this)
+ setContentView(binding?.root)
+ inject(this, coreModule)
+ navigateOnItemSelection(this)
+ selectDefaultItem()
+ }
+}

app/src/main/java/com/jeanbarrossilva/orca/app/activity/delegate/Binding.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2024 Orca
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If
+ * not, see https://www.gnu.org/licenses.
+ */
+
+package com.jeanbarrossilva.orca.app.activity.delegate
+
+import androidx.activity.ComponentActivity
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import com.jeanbarrossilva.orca.app.databinding.ActivityOrcaBinding
+
+internal interface Binding {
+ var binding: ActivityOrcaBinding?
+
+ fun bindView(activity: ComponentActivity) {
+ binding = ActivityOrcaBinding.inflate(activity.layoutInflater)
+ unbindOnDestroy(activity)
+ }
+
+ private fun unbindOnDestroy(activity: ComponentActivity) {
+ activity.lifecycle.addObserver(
+ object : DefaultLifecycleObserver {
+ override fun onDestroy(owner: LifecycleOwner) {
+ binding = null
+ }
+ }
+ )
+ }
+}

app/src/main/java/com/jeanbarrossilva/orca/app/activity/delegate/BottomNavigation.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2024 Orca
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If
+ * not, see https://www.gnu.org/licenses.
+ */
+
+package com.jeanbarrossilva.orca.app.activity.delegate
+
+import androidx.annotation.IdRes
+import androidx.lifecycle.lifecycleScope
+import com.jeanbarrossilva.orca.app.R
+import com.jeanbarrossilva.orca.app.navigation.BottomDestinationProvider
+import com.jeanbarrossilva.orca.platform.ui.core.navigation.NavigationActivity
+import kotlinx.coroutines.launch
+
+internal interface BottomNavigation : Binding {
+ fun navigateOnItemSelection(activity: NavigationActivity) {
+ binding?.bottomNavigationView?.setOnItemSelectedListener {
+ navigate(activity, it.itemId)
+ true
+ }
+ }
+
+ fun selectDefaultItem() {
+ binding?.bottomNavigationView?.selectedItemId = R.id.feed
+ }
+
+ private fun navigate(activity: NavigationActivity, @IdRes itemID: Int) {
+ activity.lifecycleScope.launch {
+ BottomDestinationProvider.provideAndNavigate(activity.navigator, itemID)
+ }
+ }
+}

app/src/main/java/com/jeanbarrossilva/orca/app/activity/delegate/BottomNavigationViewAvailability.kt

@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2024 Orca
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program. If
+ * not, see https://www.gnu.org/licenses.
+ */
+
+package com.jeanbarrossilva.orca.app.activity.delegate
+
+import androidx.activity.ComponentActivity
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import com.jeanbarrossilva.orca.app.R
+import com.jeanbarrossilva.orca.platform.autos.reactivity.OnBottomAreaAvailabilityChangeListener
+
+internal interface BottomNavigationViewAvailability :
+ OnBottomAreaAvailabilityChangeListener, Binding {
+ var constraintSet: ConstraintSet?
+
+ override val height
+ get() = binding?.bottomNavigationView?.height ?: 0
+
+ override fun getCurrentOffsetY(): Float {
+ return constraintSet?.getConstraint(R.id.bottom_navigation_view)?.transform?.translationY ?: 0f
+ }
+
+ override fun onBottomAreaAvailabilityChange(offsetY: Float) {
+ constraintSet?.apply {
+ getConstraint(R.id.container).layout.bottomMargin = -offsetY.toInt()
+ getConstraint(R.id.bottom_navigation_view).transform.translationY = offsetY
+ applyTo(binding?.root)
+ }
+ }
+
+ fun offsetOnChange(activity: ComponentActivity) {
+ constraintSet = ConstraintSet().apply { clone(binding?.root) }
+ dereferenceConstraintSetOnDestroy(activity)
+ }
+
+ private fun dereferenceConstraintSetOnDestroy(activity: ComponentActivity) {
+ activity.lifecycle.addObserver(
+ object : DefaultLifecycleObserver {
+ override fun onDestroy(owner: LifecycleOwner) {
+ constraintSet = null
+ }
+ }
+ )
+ }
+}