fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

use material activities at event and task activities

Browse Source
This commit is contained in:
tibbi
2023-01-08 11:19:38 +01:00
parent 054e694feb
commit b8296fbe58
4 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View File

@@ -79,6 +79,7 @@ class EventActivity : SimpleActivity() {
private lateinit var mEvent: Event private lateinit var mEvent: Event
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_event) setContentView(R.layout.activity_event)
setupOptionsMenu() setupOptionsMenu()
@@ -88,6 +89,9 @@ class EventActivity : SimpleActivity() {
return return
} }
updateMaterialActivityViews(event_coordinator, event_holder, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(event_nested_scrollview, event_toolbar)
val intent = intent ?: return val intent = intent ?: return
mWasContactsPermissionChecked = hasPermission(PERMISSION_READ_CONTACTS) mWasContactsPermissionChecked = hasPermission(PERMISSION_READ_CONTACTS)
@@ -221,7 +225,7 @@ class EventActivity : SimpleActivity() {
event_all_day.toggle() event_all_day.toggle()
} }
updateTextColors(event_scrollview) updateTextColors(event_nested_scrollview)
updateIconColors() updateIconColors()
refreshMenuItems() refreshMenuItems()
showOrHideTimeZone() showOrHideTimeZone()

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
View File

@@ -46,6 +46,7 @@ class TaskActivity : SimpleActivity() {
private var mIsNewTask = true private var mIsNewTask = true
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_task) setContentView(R.layout.activity_task)
setupOptionsMenu() setupOptionsMenu()
@@ -55,6 +56,9 @@ class TaskActivity : SimpleActivity() {
return return
} }
updateMaterialActivityViews(task_coordinator, task_holder, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(task_nested_scrollview, task_toolbar)
val intent = intent ?: return val intent = intent ?: return
updateColors() updateColors()
val taskId = intent.getLongExtra(EVENT_ID, 0L) val taskId = intent.getLongExtra(EVENT_ID, 0L)
@@ -726,7 +730,7 @@ class TaskActivity : SimpleActivity() {
} }
private fun updateColors() { private fun updateColors() {
updateTextColors(task_scrollview) updateTextColors(task_nested_scrollview)
val textColor = getProperTextColor() val textColor = getProperTextColor()
arrayOf( arrayOf(
task_time_image, task_reminder_image, task_type_image, task_repetition_image task_time_image, task_reminder_image, task_type_image, task_repetition_image

34
app/src/main/res/layout/activity_event.xml
View File

@@ -6,28 +6,22 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/event_app_bar_layout" android:id="@+id/event_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_event"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
<com.google.android.material.appbar.MaterialToolbar <androidx.core.widget.NestedScrollView
android:id="@+id/event_toolbar" android:id="@+id/event_nested_scrollview"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_event"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:id="@+id/event_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:scrollbars="none" android:layout_marginTop="?attr/actionBarSize"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> android:fillViewport="true"
android:scrollbars="none">
<RelativeLayout <RelativeLayout
android:id="@+id/event_holder" android:id="@+id/event_holder"
@@ -634,5 +628,5 @@
android:importantForAccessibility="no" /> android:importantForAccessibility="no" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

34
app/src/main/res/layout/activity_task.xml
View File

@@ -6,28 +6,22 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/task_app_bar_layout" android:id="@+id/task_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_task"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
<com.google.android.material.appbar.MaterialToolbar <androidx.core.widget.NestedScrollView
android:id="@+id/task_toolbar" android:id="@+id/task_nested_scrollview"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu_task"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
</com.google.android.material.appbar.AppBarLayout>
<ScrollView
android:id="@+id/task_scrollview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:scrollbars="none" android:layout_marginTop="?attr/actionBarSize"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> android:fillViewport="true"
android:scrollbars="none">
<RelativeLayout <RelativeLayout
android:id="@+id/task_holder" android:id="@+id/task_holder"
@@ -385,5 +379,5 @@
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>