diff --git a/visionppi/.idea/codeStyles/Project.xml b/visionppi/.idea/codeStyles/Project.xml index 1bec35e..5f5fce5 100644 --- a/visionppi/.idea/codeStyles/Project.xml +++ b/visionppi/.idea/codeStyles/Project.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + 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 93951a2..db282ef 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 @@ -49,8 +49,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte setSupportActionBar(toolbar) val actionBar = supportActionBar - actionBar?.title = "Vision PPI" - + actionBar?.title = getString(R.string.app_name) search_btn.setOnClickListener { @@ -109,7 +108,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 } @@ -119,7 +118,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/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"> + + + + +