Merge pull request #242 from naz013/release/9.4.0

Release/9.4.0
naz013 · Dec 15, 2024 · e5ca4d4 · e5ca4d4
2 parents 38cb402 + f115bf0
commit e5ca4d4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/build_and_publish_release.yml b/.github/workflows/build_and_publish_release.yml
@@ -93,6 +93,7 @@ jobs:
         packageName: com.cray.software.justreminder
         releaseFiles: ${{ steps.sign-free.outputs.signedReleaseFile }}
         track: alpha
+        changesNotSentForReview: true
 
     - name: Sign Pro AAB
       id: sign-pro
@@ -111,3 +112,4 @@ jobs:
         packageName: com.cray.software.justreminderpro
         releaseFiles: ${{ steps.sign-pro.outputs.signedReleaseFile }}
         track: alpha
+        changesNotSentForReview: true
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@
 /app/keys.gradle
 /keystore.properties
 /hs_err_pid1568.log
+/.kotlin/
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'com.cray.software.justreminder'
         minSdkVersion 29
         targetSdkVersion 35
-        versionCode 315
-        versionName "9.3.4"
+        versionCode 318
+        versionName "9.4.0"
         multiDexEnabled true
         renderscriptTargetApi 23
         renderscriptSupportModeEnabled true

diff --git a/app/src/main/java/com/elementary/tasks/reminder/create/CreateReminderActivity.kt b/app/src/main/java/com/elementary/tasks/reminder/create/CreateReminderActivity.kt
@@ -13,7 +13,6 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.BaseAdapter
-import androidx.activity.enableEdgeToEdge
 import androidx.core.view.get
 import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Observer
@@ -34,8 +33,6 @@ import com.elementary.tasks.core.utils.Constants
 import com.elementary.tasks.core.utils.Module
 import com.elementary.tasks.core.utils.datetime.DateTimeManager
 import com.elementary.tasks.core.utils.io.MemoryUtil
-import com.elementary.tasks.core.utils.ui.applyBottomInsets
-import com.elementary.tasks.core.utils.ui.applyTopInsets
 import com.elementary.tasks.core.utils.ui.visibleGone
 import com.elementary.tasks.databinding.ActivityCreateReminderBinding
 import com.elementary.tasks.databinding.ListItemNavigationBinding
@@ -98,16 +95,14 @@ class CreateReminderActivity : BindingActivity<ActivityCreateReminderBinding>(),
   override fun requireLogin() = true
 
   override fun onCreate(savedInstanceState: Bundle?) {
-    enableEdgeToEdge()
     super.onCreate(savedInstanceState)
-    binding.appBar.applyTopInsets()
-    binding.coordinator.applyBottomInsets()
 
     hasLocation = Module.hasLocation(this)
     isTablet = resources.getBoolean(R.bool.is_tablet)
     canExportToCalendar = prefs.isCalendarEnabled || prefs.isStockCalendarEnabled
     canExportToTasks = stateViewModel.isLoggedToGoogleTasks()
 
+    initActionBar()
     initNavigation()
 
     if (savedInstanceState == null) {
@@ -119,6 +114,14 @@ class CreateReminderActivity : BindingActivity<ActivityCreateReminderBinding>(),
     loadReminder()
   }
 
+  private fun initActionBar() {
+    setSupportActionBar(binding.toolbar)
+    supportActionBar?.setDisplayShowTitleEnabled(false)
+    supportActionBar?.setDisplayHomeAsUpEnabled(true)
+    supportActionBar?.setHomeButtonEnabled(true)
+    supportActionBar?.setDisplayShowHomeEnabled(true)
+  }
+
   private fun openScreen(uiSelectorType: UiSelectorType) {
     when (uiSelectorType) {
       UiSelectorType.DATE -> replaceFragment(DateFragment())

diff --git a/app/src/main/res/layout/activity_create_reminder.xml b/app/src/main/res/layout/activity_create_reminder.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout

diff --git a/app/src/main/res/values/whats_new_strings.xml b/app/src/main/res/values/whats_new_strings.xml
@@ -3,6 +3,7 @@
     <string name="whats_new_version_and_date" translatable="false">%s, %s</string>
     <string name="whats_new_text" translatable="false">
         \n
+        ✅ Add Android 15 support;\n
         ✅ Add option to attach the Note to the Reminder;\n
         ⭐ Update translations;\n
         🐞 Bug fixes and improvements.

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools:r8:8.5.35'
         classpath 'com.android.tools.build:gradle:8.7.3'
         classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'