diff --git a/app/build.gradle b/app/build.gradle index 944a004f..4eb677e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:3f2813db2e' + implementation 'com.github.SimpleMobileTools:Simple-Commons:d41abd229b' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.documentfile:documentfile:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index e4e971e9..b5f76e1e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -90,7 +90,7 @@ class MainActivity : SimpleActivity() { setupOptionsMenu() refreshMenuItems() - updateMaterialActivityViews(main_coordinator, null) + updateMaterialActivityViews(main_coordinator, null, false) searchQueryET = findViewById(R.id.search_query) searchPrevBtn = findViewById(R.id.search_previous) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt index 792e6491..39e34ede 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt @@ -26,7 +26,7 @@ class SettingsActivity : SimpleActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) - updateMaterialActivityViews(settings_coordinator, settings_holder) + updateMaterialActivityViews(settings_coordinator, settings_holder, true) setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar) } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index 38cafa6b..7e671707 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -4,7 +4,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.coordinatorlayout.widget.CoordinatorLayout import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.simplemobiletools.commons.extensions.* @@ -117,13 +116,8 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { showNewItemDialog() (view.checklist_list.adapter as? ChecklistAdapter)?.finishActMode() } - - val bottomMargin = (resources.getDimension(R.dimen.activity_margin) + context.navigationBarHeight).toInt() - (layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = bottomMargin } - view.checklist_list.setPadding(0, 0, 0, (resources.getDimension(R.dimen.secondary_fab_bottom_margin) + requireContext().navigationBarHeight).toInt()) - view.fragment_placeholder.setTextColor(requireActivity().getProperTextColor()) view.fragment_placeholder_2.apply { setTextColor(adjustedPrimaryColor) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt index c2f46c89..509d7eb9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt @@ -15,7 +15,6 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.mydebug import com.simplemobiletools.notes.pro.R import com.simplemobiletools.notes.pro.activities.MainActivity import com.simplemobiletools.notes.pro.extensions.config @@ -164,10 +163,6 @@ class TextFragment : NoteFragment() { checkLockState() setTextWatcher() - - view.text_note_view.apply { - setPadding(paddingLeft, paddingTop, paddingRight, (context.resources.getDimension(R.dimen.activity_margin) + context.navigationBarHeight).toInt()) - } } fun setTextWatcher() {