Merge branch 'feature/jetpack-compose_20240413' into feature/splash-api

hanjoongcho · Jun 18, 2024 · 2407b62 · 2407b62
2 parents 3291ded + ac15bdb
commit 2407b62
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 38 deletions.
diff --git a/app/src/main/java/me/blog/korn123/easydiary/activities/BaseDevActivity.kt b/app/src/main/java/me/blog/korn123/easydiary/activities/BaseDevActivity.kt
@@ -34,7 +34,6 @@ import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -50,7 +49,6 @@ import androidx.compose.ui.unit.dp
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
@@ -110,7 +108,6 @@ import me.blog.korn123.easydiary.models.ActionLog
 import me.blog.korn123.easydiary.models.Diary
 import me.blog.korn123.easydiary.services.BaseNotificationService
 import me.blog.korn123.easydiary.services.NotificationService
-import me.blog.korn123.easydiary.ui.components.CardContainer
 import me.blog.korn123.easydiary.ui.components.CategoryTitleCard
 import me.blog.korn123.easydiary.ui.components.ScrollableCard
 import me.blog.korn123.easydiary.ui.components.SimpleCard
@@ -181,7 +178,7 @@ open class BaseDevActivity : EasyDiaryActivity() {
         super.onCreate(savedInstanceState)
         mBinding = ActivityBaseDevBinding.inflate(layoutInflater)
         setContentView(mBinding.root)
-        setSupportActionBar(mBinding.toolbar)
+        setSupportActionBar(mBinding.partialAppbarLayout.toolbar)
         supportActionBar?.run {
             title = "Easy-Diary Dev Mode"
             setDisplayHomeAsUpEnabled(true)
@@ -609,7 +606,7 @@ open class BaseDevActivity : EasyDiaryActivity() {
         CategoryTitleCard(title = "Custom Launcher")
         FlowRow(
             maxItemsInEachRow = maxItemsInEachRow,
-            modifier = Modifier.padding(6.dp, 3.dp)
+            modifier = Modifier
         ) {
             SimpleCard(
                 "EasyDiary Launcher",
@@ -790,7 +787,7 @@ open class BaseDevActivity : EasyDiaryActivity() {
         AppTheme {
             val configuration = LocalConfiguration.current
             val maxItemsInEachRow = if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) 2 else 3
-            CardContainer {
+            Column {
                 val settingCardModifier = Modifier
                     .fillMaxWidth()
                     .weight(1f)

diff --git a/app/src/main/java/me/blog/korn123/easydiary/activities/EasyDiaryActivity.kt b/app/src/main/java/me/blog/korn123/easydiary/activities/EasyDiaryActivity.kt
@@ -3,6 +3,7 @@ package me.blog.korn123.easydiary.activities
 import android.content.Intent
 import android.hardware.SensorManager
 import android.os.Bundle
+import android.view.View
 import android.view.ViewGroup
 import com.simplemobiletools.commons.models.Release
 import com.squareup.seismic.ShakeDetector
@@ -21,9 +22,6 @@ import java.util.Calendar
 
 open class EasyDiaryActivity : BaseSimpleActivity(), ShakeDetector.Listener {
     var mCustomLineSpacing = true
-    private val mRootView: ViewGroup? by lazy {
-        findViewById(R.id.main_holder)
-    }
 
 
     /***************************************************************************************************
@@ -48,7 +46,7 @@ open class EasyDiaryActivity : BaseSimpleActivity(), ShakeDetector.Listener {
             startMainActivityWithClearTask()
         } else {
             resumeLock()
-            mRootView?.let {
+            getMainViewGroup()?.let {
                 initTextSize(it)
                 updateTextColors(it)
                 updateAppViews(it)
@@ -78,7 +76,7 @@ open class EasyDiaryActivity : BaseSimpleActivity(), ShakeDetector.Listener {
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
     }
 
-    override fun getMainViewGroup(): ViewGroup? = mRootView
+    override fun getMainViewGroup(): ViewGroup? = if (findViewById<View>(R.id.main_holder) != null) findViewById(R.id.main_holder) else findViewById(R.id.compose_view)
 
     override fun hearShake() {
         TransitionHelper.startActivityWithTransition(

diff --git a/app/src/main/res/layout/activity_base_dev.xml b/app/src/main/res/layout/activity_base_dev.xml
@@ -5,35 +5,17 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/app_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-    </com.google.android.material.appbar.AppBarLayout>
+    <include
+        android:id="@+id/partial_appbar_layout"
+        layout="@layout/partial_appbar_layout" />
 
-    <LinearLayout
-        android:id="@+id/main_holder"
-        style="@style/LinearLayoutVertical"
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/compose_view"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/partial_appbar_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/app_bar">
-
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/compose_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-    </LinearLayout>
+        android:layout_weight="1" />
 
     <include
         android:id="@+id/partial_settings_progress"
@@ -43,6 +25,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/app_bar" />
+        app:layout_constraintTop_toBottomOf="@+id/partial_appbar_layout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/partial_appbar_layout.xml b/app/src/main/res/layout/partial_appbar_layout.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/app_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:theme="@style/AppTheme.AppBarOverlay"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:popupTheme="@style/AppTheme.PopupOverlay" />
+</com.google.android.material.appbar.AppBarLayout>
+
+