fenix
/
Simple-Notes
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding some main activity redesigns

This commit is contained in:
tibbi 2022-12-24 23:52:44 +01:00
parent 51c8e6bed4
commit 4c43f01334
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -63,7 +63,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:6323be1fd7'
implementation 'com.github.SimpleMobileTools:Simple-Commons:4caf4d52e8'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.documentfile:documentfile:1.0.1'

13
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -83,12 +83,15 @@ class MainActivity : SimpleActivity() {
private lateinit var searchClearBtn: ImageView
override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
appLaunched(BuildConfig.APPLICATION_ID)
setupOptionsMenu()
refreshMenuItems()
updateMaterialActivityViews(main_coordinator, main_linear_layout)
searchQueryET = findViewById(R.id.search_query)
searchPrevBtn = findViewById(R.id.search_previous)
searchNextBtn = findViewById(R.id.search_next)
@ -130,11 +133,13 @@ class MainActivity : SimpleActivity() {
checkShortcuts()
search_wrapper.setBackgroundColor(getProperPrimaryColor())
search_wrapper.setBackgroundColor(getProperStatusBarColor())
val contrastColor = getProperPrimaryColor().getContrastColor()
arrayListOf(searchPrevBtn, searchNextBtn, searchClearBtn).forEach {
it.applyColorFilter(contrastColor)
}
updateTopBarColors(main_toolbar, getProperBackgroundColor())
}
override fun onPause() {
@ -542,7 +547,8 @@ class MainActivity : SimpleActivity() {
private fun openSearch() {
isSearchActive = true
search_wrapper.beVisible()
search_wrapper.fadeIn()
animateTopBarColors(window.statusBarColor, getProperStatusBarColor(), main_toolbar)
showKeyboard(searchQueryET)
currentNotesView()?.let { noteView ->
@ -558,7 +564,8 @@ class MainActivity : SimpleActivity() {
private fun closeSearch() {
searchQueryET.text?.clear()
isSearchActive = false
search_wrapper.beGone()
search_wrapper.fadeOut()
animateTopBarColors(window.statusBarColor, getProperBackgroundColor(), main_toolbar)
}
private fun getWantedNoteIndex(wantedNoteId: Long?): Int {

24
app/src/main/res/layout/activity_main.xml
View File

@ -5,28 +5,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/main_app_bar_layout"
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
</com.google.android.material.appbar.AppBarLayout>
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:menu="@menu/menu"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
<LinearLayout
android:id="@+id/main_linear_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
android:layout_marginTop="?attr/actionBarSize"
android:orientation="vertical">
<include
android:id="@+id/search_wrapper"