Skip to content

Commit 4e80451

Browse files
committed
redesigning Main activity
1 parent e0d9ae1 commit 4e80451

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@ import kotlinx.android.synthetic.main.activity_main.*
1616

1717
class MainActivity : SimpleActivity() {
1818
override fun onCreate(savedInstanceState: Bundle?) {
19+
isMaterialActivity = true
1920
super.onCreate(savedInstanceState)
2021
setContentView(R.layout.activity_main)
2122
appLaunched(BuildConfig.APPLICATION_ID)
2223
setupOptionsMenu()
2324
refreshMenuItems()
2425

26+
updateMaterialActivityViews(main_coordinator, main_holder)
27+
setupMaterialScrollListener(main_nested_scrollview, main_toolbar)
28+
2529
change_keyboard_holder.setOnClickListener {
2630
(getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager).showInputMethodPicker()
2731
}

app/src/main/res/layout/activity_main.xml

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,24 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<com.google.android.material.appbar.AppBarLayout
9-
android:id="@+id/main_app_bar_layout"
8+
<com.google.android.material.appbar.MaterialToolbar
9+
android:id="@+id/main_toolbar"
1010
android:layout_width="match_parent"
11-
android:layout_height="wrap_content">
12-
13-
<com.google.android.material.appbar.MaterialToolbar
14-
android:id="@+id/main_toolbar"
15-
android:layout_width="match_parent"
16-
android:layout_height="?attr/actionBarSize"
17-
android:background="@color/color_primary"
18-
app:menu="@menu/menu_main"
19-
app:title="@string/app_launcher_name"
20-
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
21-
22-
</com.google.android.material.appbar.AppBarLayout>
11+
android:layout_height="?attr/actionBarSize"
12+
android:background="@color/color_primary"
13+
app:menu="@menu/menu_main"
14+
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
2315

2416
<androidx.core.widget.NestedScrollView
2517
android:id="@+id/main_nested_scrollview"
2618
android:layout_width="match_parent"
2719
android:layout_height="match_parent"
20+
android:layout_marginTop="?attr/actionBarSize"
2821
android:fillViewport="true"
29-
android:scrollbars="none"
30-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
22+
android:scrollbars="none">
3123

3224
<RelativeLayout
33-
android:id="@+id/change_keyboard_wrapper"
25+
android:id="@+id/main_holder"
3426
android:layout_width="match_parent"
3527
android:layout_height="wrap_content">
3628

0 commit comments

Comments
 (0)