diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt index e7f93ca..5168ba3 100644 --- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt +++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/home/MainActivity.kt @@ -41,6 +41,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte binding = DataBindingUtil.setContentView(this, R.layout.activity_main) client_search_list.layoutManager = LinearLayoutManager(this) + setSupportActionBar(toolbar) + val actionBar = supportActionBar + actionBar?.title = getString(R.string.app_name) + + search_btn.setOnClickListener { @@ -69,7 +74,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } } - override fun onCreateOptionsMenu(menu: Menu): Boolean { + /*override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.main, menu) return true } @@ -79,7 +84,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte R.id.action_settings -> return true else -> return super.onOptionsItemSelected(item) } - } + }*/ override fun onNavigationItemSelected(item: MenuItem): Boolean { when (item.itemId) { diff --git a/visionppi/app/src/main/res/drawable/button_design.xml b/visionppi/app/src/main/res/drawable/button_design.xml new file mode 100644 index 0000000..138e5f4 --- /dev/null +++ b/visionppi/app/src/main/res/drawable/button_design.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/visionppi/app/src/main/res/layout/content_main.xml b/visionppi/app/src/main/res/layout/content_main.xml index 78448f5..1f25106 100644 --- a/visionppi/app/src/main/res/layout/content_main.xml +++ b/visionppi/app/src/main/res/layout/content_main.xml @@ -1,83 +1,75 @@ - + - - - - - - - + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:context="org.mifos.visionppi.ui.home.MainActivity" + tools:showIn="@layout/app_bar_main"> - - - - + android:layout_height="match_parent" + android:background="@color/veryLightGray" + android:orientation="vertical" + android:padding="@dimen/ll_margin" + tools:layout_editor_absoluteX="-16dp" + tools:layout_editor_absoluteY="-62dp"> + + - - - - + android:layout_marginTop="@dimen/activity_vertical_margin"> + + + + +