Fix font, text appearance, keyboard

This commit is contained in:
h4h13 2019-04-05 16:15:09 +05:30
parent af7404f4a4
commit 614d687827
46 changed files with 347 additions and 126 deletions

View file

@ -0,0 +1,23 @@
<!--
~ Copyright (c) 2019 Hemanth Savarala.
~
~ Licensed under the GNU General Public License v3
~
~ This is free software: you can redistribute it and/or modify it under
~ the terms of the GNU General Public License as published by
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
~ See the GNU General Public License for more details.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>

View file

@ -0,0 +1,23 @@
<!--
~ Copyright (c) 2019 Hemanth Savarala.
~
~ Licensed under the GNU General Public License v3
~
~ This is free software: you can redistribute it and/or modify it under
~ the terms of the GNU General Public License as published by
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
~ See the GNU General Public License for more details.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
</vector>

View file

@ -1,12 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2019 Hemanth Savarala.
~
~ Licensed under the GNU General Public License v3
~
~ This is free software: you can redistribute it and/or modify it under
~ the terms of the GNU General Public License as published by
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
~ See the GNU General Public License for more details.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/md_white_1000"
android:pathData="M22 9.24l-7.19-0.62L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21 12 17.27 18.18 21l-1.63-7.03L22 9.24zM12 15.4l-3.76 2.27 1-4.28-3.32-2.88 4.38-0.38L12 6.1l1.71 4.04 4.38 0.38 -3.32 2.88 1 4.28L12 15.4z" />
</vector>
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
</vector>

View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2019 Hemanth Savarala.
~
~ Licensed under the GNU General Public License v3
~
~ This is free software: you can redistribute it and/or modify it under
~ the terms of the GNU General Public License as published by
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
~ See the GNU General Public License for more details.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/md_white_1000"
android:pathData="M12 2l-5.5 9h11L12 2zm0 3.84L13.93 9h-3.87L12 5.84zM17.5 13c-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5 4.5 4.5-2.01 4.5-4.5-2.01-4.5-4.5-4.5zm0 7c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5zM3 21.5h8v-8H3v8zm2-6h4v4H5v-4z" />
</vector>

View file

@ -4,6 +4,11 @@
android:font="@font/circular_std_book"
android:fontStyle="normal"
android:fontWeight="400" />
<font
android:font="@font/circular_std_medium"
android:fontStyle="normal"
android:fontWeight="700" />
<font
android:font="@font/circular_std_black"
android:fontWeight="900" />

Binary file not shown.

View file

@ -83,7 +83,6 @@
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="4dp"
android:scrollHorizontally="true"
android:singleLine="true"
tools:ignore="MissingPrefix"

View file

@ -25,7 +25,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/action_tag_editor" />
</androidx.appcompat.widget.Toolbar>

View file

@ -38,9 +38,9 @@
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
app:title="">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/settingsTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/action_settings" />
</androidx.appcompat.widget.Toolbar>

View file

@ -109,7 +109,6 @@
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="4dp"
android:scrollHorizontally="true"
android:singleLine="true"
tools:ignore="MissingPrefix"

View file

@ -111,7 +111,6 @@
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="4dp"
android:scrollHorizontally="true"
android:singleLine="true"
tools:ignore="MissingPrefix"

View file

@ -19,7 +19,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/profile" />
</androidx.appcompat.widget.Toolbar>
@ -108,7 +108,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
app:boxBackgroundMode="filled"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
app:hintEnabled="true">
@ -129,7 +129,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
app:boxBackgroundMode="filled"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
app:hintEnabled="true">
@ -145,13 +145,15 @@
</LinearLayout>
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/next"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_gravity="bottom"
android:layout_margin="16dp"
android:elevation="8dp"
android:gravity="center"
app:iconGravity="textStart"
android:padding="16dp"
app:srcCompat="@drawable/ate_check" />
android:text="@string/save"
app:icon="@drawable/ic_save_white_24dp" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -21,7 +21,7 @@
<TextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/action_about" />
</androidx.appcompat.widget.Toolbar>

View file

@ -5,11 +5,12 @@
android:padding="8dp"
android:orientation="vertical">
<include layout="@layout/card_credit"/>
<include layout="@layout/card_retro_info"/>
<include layout="@layout/card_social"/>
<include layout="@layout/card_other"/>
<include layout="@layout/card_credit"/>
</LinearLayout>

View file

@ -99,7 +99,6 @@
android:focusableInTouchMode="true"
android:freezesText="true"
android:marqueeRepeatLimit="marquee_forever"
android:paddingTop="4dp"
android:scrollHorizontally="true"
android:singleLine="true"
tools:ignore="MissingPrefix"

View file

@ -70,7 +70,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/action_tag_editor" />
</androidx.appcompat.widget.Toolbar>

View file

@ -25,9 +25,9 @@
app:title=""
tools:ignore="UnusedAttribute">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/support_development" />
</androidx.appcompat.widget.Toolbar>

View file

@ -35,7 +35,7 @@
android:layout_gravity="center"
android:gravity="center"
android:text="@string/equalizer"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
style="@style/BigTitleTextAppearanceToolbar"
tools:ignore="MissingPrefix" />
<androidx.appcompat.widget.SwitchCompat
@ -43,8 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
android:layout_marginEnd="16dp" />
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>

View file

@ -1 +1 @@
<?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" app:elevation="0dp"> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin"> <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" android:text="@string/error" android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textStyle="bold" tools:ignore="MissingPrefix" /> </androidx.appcompat.widget.Toolbar> </com.google.android.material.appbar.AppBarLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="16dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingBottom="16dp" app:srcCompat="@drawable/ic_bug_report_white_24dp" app:tint="@color/md_grey_800" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/bug_report_summary" /> <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_weight="1"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/showCrashError" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/md_grey_400" android:padding="16dp" android:text="@string/error" /> </ScrollView> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_weight="0" android:gravity="center"> <com.google.android.material.card.MaterialCardView android:id="@+id/sendCrashLog" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/md_blue_A200" app:cardCornerRadius="6dp" app:cardUseCompatPadding="true"> <TextView android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:paddingStart="20dp" android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" android:text="@string/send_crash_log" android:textColor="@color/md_white_1000" /> </com.google.android.material.card.MaterialCardView> <com.google.android.material.card.MaterialCardView android:id="@+id/clearAppData" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/md_blue_A200" app:cardCornerRadius="6dp" app:cardUseCompatPadding="true"> <TextView android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:paddingStart="20dp" android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" android:text="@string/clear_app_data" android:textColor="@color/md_white_1000" /> </com.google.android.material.card.MaterialCardView> </LinearLayout> </LinearLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
<?xml version="1.0" encoding="utf-8"?> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" android:elevation="0dp" app:elevation="0dp"> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin"> <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" android:text="@string/error" style="@style/BigTitleTextAppearanceToolbar" android:textStyle="bold" tools:ignore="MissingPrefix" /> </androidx.appcompat.widget.Toolbar> </com.google.android.material.appbar.AppBarLayout> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:padding="16dp" app:layout_behavior="@string/appbar_scrolling_view_behavior"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingBottom="16dp" app:srcCompat="@drawable/ic_bug_report_white_24dp" app:tint="@color/md_grey_800" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/bug_report_summary" /> <ScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_weight="1"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/showCrashError" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/md_grey_400" android:padding="16dp" android:text="@string/error" /> </ScrollView> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_weight="0" android:gravity="center"> <com.google.android.material.card.MaterialCardView android:id="@+id/sendCrashLog" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/md_blue_A200" app:cardCornerRadius="6dp" app:cardUseCompatPadding="true"> <TextView android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:paddingStart="20dp" android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" android:text="@string/send_crash_log" android:textColor="@color/md_white_1000" /> </com.google.android.material.card.MaterialCardView> <com.google.android.material.card.MaterialCardView android:id="@+id/clearAppData" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" app:cardBackgroundColor="@color/md_blue_A200" app:cardCornerRadius="6dp" app:cardUseCompatPadding="true"> <TextView android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:paddingStart="20dp" android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" android:text="@string/clear_app_data" android:textColor="@color/md_white_1000" /> </com.google.android.material.card.MaterialCardView> </LinearLayout> </LinearLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -28,9 +28,9 @@
app:title=""
tools:ignore="UnusedAttribute">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/licenses" />
</androidx.appcompat.widget.Toolbar>

View file

@ -28,9 +28,9 @@
app:title=""
tools:ignore="UnusedAttribute">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/queue" />
</androidx.appcompat.widget.Toolbar>

View file

@ -48,9 +48,9 @@
app:title=""
tools:ignore="UnusedAttribute">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance" />
style="@style/BigTitleTextAppearanceToolbar" />
</androidx.appcompat.widget.Toolbar>
</FrameLayout>

View file

@ -41,9 +41,9 @@
app:layout_collapseMode="pin"
tools:ignore="UnusedAttribute">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/buy_retro_music_pro" />
</androidx.appcompat.widget.Toolbar>

View file

@ -1,23 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:fitsSystemWindows="true"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:fitsSystemWindows="true"
android:elevation="0dp"
app:elevation="0dp"
android:id="@+id/appBarLayout"
android:layout_height="wrap_content">
<include layout="@layout/status_bar" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -35,6 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="8dp"
app:cardCornerRadius="25dp"
app:cardElevation="0dp">
@ -45,7 +42,7 @@
android:background="@null"
android:hint="@string/action_search"
android:inputType="text|textAutoComplete"
android:padding="12dp">
android:padding="14dp">
<requestFocus />
</code.name.monkey.appthemehelper.common.views.ATEEditText>
@ -61,32 +58,41 @@
android:padding="14dp"
app:srcCompat="@drawable/ic_mic_white_24dp" />
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
<FrameLayout
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="48dp"
android:paddingBottom="48dp"
android:text="@string/no_results"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:visibility="gone"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="48dp"
android:paddingBottom="48dp"
android:text="@string/no_results"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:visibility="gone"
tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</FrameLayout>
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:layout_width="wrap_content"
android:id="@+id/keyboardPopup"
android:text="Keyboard"
android:layout_margin="16dp"
android:layout_gravity="bottom|end"
app:icon="@drawable/ic_keyboard_white_24dp"
android:layout_height="wrap_content"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -27,9 +27,9 @@
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
app:title="">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/settingsTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/action_settings" />
</androidx.appcompat.widget.Toolbar>

View file

@ -20,7 +20,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/profile" />
</androidx.appcompat.widget.Toolbar>
@ -142,13 +142,16 @@
</LinearLayout>
</LinearLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/next"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_gravity="bottom"
android:layout_margin="16dp"
android:elevation="8dp"
android:gravity="center"
app:iconGravity="textStart"
android:padding="16dp"
app:srcCompat="@drawable/ate_check" />
android:text="@string/save"
app:icon="@drawable/ic_save_white_24dp" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View file

@ -20,9 +20,9 @@
app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
app:title="">
<TextView
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:id="@+id/bannerTitle"
style="@style/BigTitleTextAppearance"
style="@style/BigTitleTextAppearanceToolbar"
android:text="@string/whats_new" />
</androidx.appcompat.widget.Toolbar>

View file

@ -22,16 +22,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/madeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="16dp"
android:text="@string/made_with_love"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

View file

@ -36,6 +36,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/changelog" />
@ -65,6 +66,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/pref_title_open_source_licences" />
@ -93,6 +95,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/version" />
@ -104,5 +107,16 @@
android:alpha="0.85"
android:text="0.0.0" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/madeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="16dp"
android:text="@string/made_with_love"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

View file

@ -49,6 +49,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:fontFamily="@font/circular"
android:text="@string/git_hub" />
@ -94,6 +95,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/translate" />
@ -138,6 +140,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/rate_app" />
@ -182,6 +185,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/donate" />
@ -228,6 +232,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/action_share"
android:textColor="@color/md_white_1000" />
@ -268,6 +273,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/faq"
android:textColor="@color/md_white_1000" />

View file

@ -48,6 +48,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/pinterest_page" />
@ -92,6 +93,7 @@
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fontFamily="@font/circular_std_medium"
android:text="@string/instagram_page" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
@ -133,6 +135,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/twitter_page" />
@ -175,6 +178,7 @@
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content"
android:text="@string/discord_page" />
@ -218,6 +222,7 @@
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fontFamily="@font/circular_std_medium"
android:text="@string/telegram_group" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
@ -262,6 +267,7 @@
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:fontFamily="@font/circular_std_medium"
android:text="@string/google_plus" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView

View file

@ -159,16 +159,6 @@
app:optionIcon="@drawable/ic_bug_report_white_24dp"
app:optionTitle="@string/report_bug" />
<code.name.monkey.retromusic.views.OptionMenuItemView
android:id="@+id/actionAbout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?rectSelector"
android:clickable="true"
android:focusable="true"
app:optionIcon="@drawable/ic_help_white_24dp"
app:optionTitle="@string/action_about" />
<code.name.monkey.retromusic.views.OptionMenuItemView
android:id="@+id/actionRate"
android:layout_width="match_parent"

View file

@ -42,6 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
app:fontFamily="@font/circular_std_medium"
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/general_settings_title"
@ -90,6 +91,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
app:fontFamily="@font/circular_std_medium"
android:text="@string/general_settings_title"
android:textSize="@dimen/ate_default_textsize_subheading" />
@ -136,6 +138,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
app:fontFamily="@font/circular_std_medium"
android:text="@string/now_playing"
android:textSize="@dimen/ate_default_textsize_subheading" />
@ -181,6 +184,7 @@
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/pref_header_audio"
app:fontFamily="@font/circular_std_medium"
android:textSize="@dimen/ate_default_textsize_subheading" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
@ -224,6 +228,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
app:fontFamily="@font/circular_std_medium"
android:text="@string/personalize"
android:textSize="@dimen/ate_default_textsize_subheading" />
@ -252,7 +257,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_orange_A400"
app:iconBackgroundColor="@color/md_deep_orange_A400"
app:srcCompat="@drawable/ic_image_white_24dp" />
<LinearLayout
@ -268,6 +273,7 @@
android:fadingEdge="horizontal"
android:singleLine="true"
android:text="@string/pref_header_images"
app:fontFamily="@font/circular_std_medium"
android:textSize="@dimen/ate_default_textsize_subheading" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
@ -310,6 +316,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
app:fontFamily="@font/circular_std_medium"
android:text="@string/notification"
android:textSize="@dimen/ate_default_textsize_subheading" />
@ -339,7 +346,7 @@
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_indigo_A400"
app:srcCompat="@drawable/ic_settings_white_24dp" />
app:srcCompat="@drawable/ic_testing_white_24dp" />
<LinearLayout
android:layout_width="match_parent"
@ -354,10 +361,63 @@
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
app:fontFamily="@font/circular_std_medium"
android:singleLine="true"
android:text="@string/others"
android:textSize="@dimen/ate_default_textsize_subheading" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/other_settings_summary"
android:textSize="@dimen/ate_default_textsize_body" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/aboutSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="72dp"
android:background="?rectSelector"
android:gravity="center_vertical"
android:orientation="horizontal">
<code.name.monkey.retromusic.views.ColorIconsImageView
android:id="@+id/about_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:padding="10dp"
app:iconBackgroundColor="@color/md_light_green_A400"
app:srcCompat="@drawable/ic_info_outline_black_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:gravity="center_vertical"
android:orientation="vertical">
<code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
app:fontFamily="@font/circular_std_medium"
android:singleLine="true"
android:text="@string/action_about"
android:textSize="@dimen/ate_default_textsize_subheading" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:text="@string/about_settings_summary"
android:textSize="@dimen/ate_default_textsize_body" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View file

@ -33,6 +33,7 @@
android:id="@+id/title"
style="@style/TextAppearance.MaterialComponents.Subtitle1"
android:layout_width="match_parent"
app:fontFamily="@font/circular_std_medium"
android:layout_height="wrap_content" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView

View file

@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
app:fontFamily="@font/circular_std_book"
android:textSize="16sp" />
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
@ -89,9 +89,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
app:fontFamily="@font/circular_std_book"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2" />
android:maxLines="1" />
</LinearLayout>
<code.name.monkey.retromusic.views.IconImageView

View file

@ -57,7 +57,6 @@
<code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
android:id="@+id/time"
style="@style/TextAppearance.MaterialComponents.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"

View file

@ -7,7 +7,7 @@
android:id="@+id/action_grid_size"
android:icon="@drawable/ic_grid_size_white_24dp"
android:title="@string/action_grid_size"
app:showAsAction="ifRoom">
app:showAsAction="ifRoom|withText">
<menu>
<group
android:id="@+id/group_grid_size"

View file

@ -612,5 +612,7 @@
<string name="synced_lyrics">Synced lyrics</string>
<string name="dialog_title_set_ringtone">Set ringtone</string>
<string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
<string name="about_settings_summary">Team, social links</string>
<string name="other_settings_summary">Advanced testing features</string>
</resources>

View file

@ -60,11 +60,11 @@
</style>
<style name="BigTitleTextAppearanceToolbar">
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
<item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
</item>
<item name="android:fontFamily">@font/circular_std_medium</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textStyle">bold</item>
<item name="android:layout_gravity">center</item>
<item name="android:gravity">center</item>
</style>