fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-03-01 01:27:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from smichel17/no-fab

Browse Source 
Remove fab
This commit is contained in:
Tibor Kaputa 2016-12-18 19:21:25 +01:00 committed by GitHub
commit b8479144fb
3 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,12 +39,6 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
pager_title_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize()) pager_title_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
pager_title_strip.layoutParams.height = (pager_title_strip.height + resources.getDimension(R.dimen.activity_margin) * 2).toInt() pager_title_strip.layoutParams.height = (pager_title_strip.height + resources.getDimension(R.dimen.activity_margin) * 2).toInt()
notes_fab.setOnClickListener { displayNewNoteDialog() }
notes_fab.viewTreeObserver.addOnGlobalLayoutListener {
val heightDiff = notes_coordinator.rootView.height - notes_coordinator.height
notes_fab.visibility = if (heightDiff > dpToPx(200f)) View.INVISIBLE else View.VISIBLE
}
} }
fun initViewPager() { fun initViewPager() {
@ -92,33 +86,19 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) { when (item.itemId) {
R.id.open_note -> { R.id.open_note -> displayOpenNoteDialog()
displayOpenNoteDialog() R.id.new_note -> displayNewNoteDialog()
true R.id.rename_note -> displayRenameDialog()
} R.id.share -> shareText()
R.id.rename_note -> { R.id.delete_note -> displayDeleteNotePrompt()
displayRenameDialog() R.id.settings ->
true
}
R.id.share -> {
shareText()
true
}
R.id.delete_note -> {
displayDeleteNotePrompt()
true
}
R.id.settings -> {
startActivity(Intent(applicationContext, SettingsActivity::class.java)) startActivity(Intent(applicationContext, SettingsActivity::class.java))
true R.id.about ->
}
R.id.about -> {
startActivity(Intent(applicationContext, AboutActivity::class.java)) startActivity(Intent(applicationContext, AboutActivity::class.java))
true else -> return super.onOptionsItemSelected(item)
}
else -> super.onOptionsItemSelected(item)
} }
return true
} }
private fun displayRenameDialog() { private fun displayRenameDialog() {

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

@ -1,12 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout <com.simplemobiletools.notes.views.MyViewPager
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/notes_coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.simplemobiletools.notes.views.MyViewPager
android:id="@+id/view_pager" android:id="@+id/view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
@ -19,14 +14,3 @@
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"/> android:paddingRight="@dimen/activity_margin"/>
</com.simplemobiletools.notes.views.MyViewPager> </com.simplemobiletools.notes.views.MyViewPager>
<android.support.design.widget.FloatingActionButton
android:id="@+id/notes_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/activity_margin"
android:src="@mipmap/plus"
app:backgroundTint="@color/colorPrimary"/>
</android.support.design.widget.CoordinatorLayout>

5
app/src/main/res/menu/menu.xml
View File

@ -6,6 +6,11 @@
android:icon="@mipmap/open_note" android:icon="@mipmap/open_note"
android:title="@string/open_note" android:title="@string/open_note"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item
android:id="@+id/new_note"
android:icon="@mipmap/plus"
android:title="@string/new_note"
app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/rename_note" android:id="@+id/rename_note"
android:icon="@mipmap/rename" android:icon="@mipmap/rename"