Fixed font size issue in various menus

Hamza417 · Nov 23, 2022 · f42fc89 · f42fc89
1 parent 9b3d390
commit f42fc89
Show file tree

Hide file tree

Showing 33 changed files with 76 additions and 68 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ plugins {
 android {
     compileSdkVersion 33
 
-    def appVersionCode = 48
+    def appVersionCode = 49
     def appVersionName = "build_$appVersionCode (alpha)"
 
     buildFeatures {

diff --git a/app/src/main/assets/html/changelogs.html b/app/src/main/assets/html/changelogs.html
@@ -30,6 +30,7 @@ <h4>Bug Fixes</h4>
 <ul>
     <li>Fixed various locale issues.</li>
     <li>Fixed bottom menu margin issue.</li>
+    <li>Fixed font size issue in various menus.</li>
 </ul>
 
 <br>

diff --git a/app/src/main/java/app/simple/inure/dialogs/analytics/AnalyticsMenu.kt b/app/src/main/java/app/simple/inure/dialogs/analytics/AnalyticsMenu.kt
@@ -18,7 +18,7 @@ class AnalyticsMenu : ScopedBottomSheetFragment() {
     private lateinit var settings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_analytics_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_analytics, container, false)
 
         sdkValue = view.findViewById(R.id.sdk_value)
         pieHoleRadius = view.findViewById(R.id.dialog_open_pie_hole)

diff --git a/app/src/main/java/app/simple/inure/dialogs/appinfo/AppInfoMenu.kt b/app/src/main/java/app/simple/inure/dialogs/appinfo/AppInfoMenu.kt
@@ -17,7 +17,7 @@ class AppInfoMenu : ScopedBottomSheetFragment() {
     private lateinit var openSettings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_app_info_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_app_info, container, false)
 
         menuLayout = view.findViewById(R.id.popup_menu_layout)
         openSettings = view.findViewById(R.id.dialog_open_apps_settings)

diff --git a/app/src/main/java/app/simple/inure/dialogs/apps/AllAppsMenu.kt b/app/src/main/java/app/simple/inure/dialogs/apps/AllAppsMenu.kt
@@ -19,7 +19,7 @@ class AllAppsMenu : ScopedBottomSheetFragment() {
     private var onGenerateListClicked: AllAppsMenuCallbacks? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_all_apps_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_all_apps, container, false)
 
         generateList = view.findViewById(R.id.dialog_export_app_list)
         openSettings = view.findViewById(R.id.dialog_open_apps_settings)

diff --git a/app/src/main/java/app/simple/inure/dialogs/batch/BatchMenu.kt b/app/src/main/java/app/simple/inure/dialogs/batch/BatchMenu.kt
@@ -17,7 +17,7 @@ class BatchMenu : ScopedBottomSheetFragment() {
     private lateinit var openSettings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_batch_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_batch, container, false)
 
         moveSelectionOnTop = view.findViewById(R.id.move_selection_on_top)
         highlightSelected = view.findViewById(R.id.highlight_selected)

diff --git a/app/src/main/java/app/simple/inure/dialogs/menus/CodeViewerMenu.kt b/app/src/main/java/app/simple/inure/dialogs/menus/CodeViewerMenu.kt
@@ -16,7 +16,7 @@ class CodeViewerMenu : ScopedBottomSheetFragment() {
     private lateinit var openSettings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_code_viewer_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_code_viewer, container, false)
 
         showNumberOnEveryLine = view.findViewById(R.id.line_number_on_every_line)
         openSettings = view.findViewById(R.id.dialog_open_apps_settings)

diff --git a/app/src/main/java/app/simple/inure/dialogs/menus/PermissionsMenu.kt b/app/src/main/java/app/simple/inure/dialogs/menus/PermissionsMenu.kt
@@ -17,7 +17,7 @@ class PermissionsMenu : ScopedBottomSheetFragment() {
     private lateinit var appSettings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_permissions, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_permissions, container, false)
 
         labelType = view.findViewById(R.id.popup_label_type)
         appSettings = view.findViewById(R.id.dialog_open_apps_settings)

diff --git a/app/src/main/java/app/simple/inure/dialogs/menus/SearchMenu.kt b/app/src/main/java/app/simple/inure/dialogs/menus/SearchMenu.kt
@@ -23,7 +23,7 @@ class SearchMenu : ScopedBottomSheetFragment() {
     private lateinit var deepSearch: SwitchView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_search_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_search, container, false)
 
         appsCategory = view.findViewById(R.id.dialog_search_apps_category)
         sortingStyle = view.findViewById(R.id.dialog_search_apps_sorting)

diff --git a/app/src/main/java/app/simple/inure/dialogs/notes/NotesEditorMenu.kt b/app/src/main/java/app/simple/inure/dialogs/notes/NotesEditorMenu.kt
@@ -17,7 +17,7 @@ class NotesEditorMenu : ScopedBottomSheetFragment() {
     private lateinit var openSettings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_notes_editor_settings, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_notes_editor, container, false)
 
         jsonSpansSwitch = view.findViewById(R.id.html_spans)
         autoSave = view.findViewById(R.id.auto_save)

diff --git a/app/src/main/java/app/simple/inure/dialogs/notes/NotesMenu.kt b/app/src/main/java/app/simple/inure/dialogs/notes/NotesMenu.kt
@@ -16,7 +16,7 @@ class NotesMenu : ScopedBottomSheetFragment() {
     private lateinit var openSettings: DynamicRippleTextView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_notes_menu, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_notes, container, false)
 
         expandedNotes = view.findViewById(R.id.expanded_notes)
         openSettings = view.findViewById(R.id.dialog_open_apps_settings)

diff --git a/app/src/main/java/app/simple/inure/dialogs/usagestats/UsageStatsMenu.kt b/app/src/main/java/app/simple/inure/dialogs/usagestats/UsageStatsMenu.kt
@@ -23,7 +23,7 @@ class UsageStatsMenu : ScopedBottomSheetFragment() {
     private lateinit var limitToHours: SwitchView
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.dialog_usage_settings, container, false)
+        val view = inflater.inflate(R.layout.dialog_menu_usage_stats, container, false)
 
         engine = view.findViewById(R.id.popup_usage_engine)
         settings = view.findViewById(R.id.dialog_open_apps_settings)

diff --git a/app/src/main/res/layout/adapter_header_battery_optimization.xml b/app/src/main/res/layout/adapter_header_battery_optimization.xml
@@ -22,8 +22,8 @@
             android:layout_height="@dimen/adapter_header_icon_size"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/app_name"
-            app:srcCompat="@drawable/ic_settings_power"
             android:transitionName="@string/battery_optimization"
+            app:srcCompat="@drawable/ic_settings_power"
             app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
@@ -56,9 +56,12 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/apps"
             android:textSize="16sp"
             app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
             app:textColorStyle="primary" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView

diff --git a/app/src/main/res/layout/adapter_header_disabled.xml b/app/src/main/res/layout/adapter_header_disabled.xml
@@ -22,9 +22,9 @@
             android:layout_height="@dimen/adapter_header_icon_size"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/disabled"
-            app:tintType="accent"
+            android:transitionName="@string/disabled"
             app:srcCompat="@drawable/ic_apps_category_disabled"
-            android:transitionName="@string/disabled" />
+            app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
             android:id="@+id/typeFaceTextView02"
@@ -53,10 +53,13 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/apps"
-            app:textColorStyle="primary"
             android:textSize="16sp"
-            app:appFontStyle="bold" />
+            app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
+            app:textColorStyle="primary" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/adapter_header_most_used.xml b/app/src/main/res/layout/adapter_header_most_used.xml
@@ -22,8 +22,8 @@
             android:layout_height="@dimen/adapter_header_icon_size"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/most_used"
-            app:srcCompat="@drawable/ic_apps_category_most_used"
             android:transitionName="@string/most_used"
+            app:srcCompat="@drawable/ic_apps_category_most_used"
             app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
@@ -56,9 +56,12 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/apps"
             android:textSize="16sp"
             app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
             app:textColorStyle="primary" />
 
     </LinearLayout>

diff --git a/app/src/main/res/layout/adapter_header_notes.xml b/app/src/main/res/layout/adapter_header_notes.xml
@@ -20,11 +20,11 @@
             android:id="@+id/imageView4"
             android:layout_width="@dimen/adapter_header_icon_size"
             android:layout_height="@dimen/adapter_header_icon_size"
-            app:tintType="accent"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/app_name"
+            android:transitionName="@string/notes"
             app:srcCompat="@drawable/ic_notes"
-            android:transitionName="@string/notes" />
+            app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
             android:id="@+id/typeFaceTextView02"
@@ -53,9 +53,12 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
-            app:textColorStyle="primary"
+            android:drawablePadding="@dimen/popup_padding"
             android:textSize="16sp"
-            app:appFontStyle="bold" />
+            app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
+            app:textColorStyle="primary" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/adapter_header_recently_installed.xml b/app/src/main/res/layout/adapter_header_recently_installed.xml
@@ -20,11 +20,11 @@
             android:id="@+id/imageView4"
             android:layout_width="@dimen/adapter_header_icon_size"
             android:layout_height="@dimen/adapter_header_icon_size"
-            app:tintType="accent"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/recently_installed"
+            android:transitionName="@string/recently_installed"
             app:srcCompat="@drawable/ic_apps_category_recently_installed"
-            android:transitionName="@string/recently_installed" />
+            app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
             android:id="@+id/typeFaceTextView02"
@@ -56,10 +56,13 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/apps"
-            app:textColorStyle="primary"
             android:textSize="16sp"
-            app:appFontStyle="bold" />
+            app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
+            app:textColorStyle="primary" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/adapter_header_recently_updated.xml b/app/src/main/res/layout/adapter_header_recently_updated.xml
@@ -20,11 +20,11 @@
             android:id="@+id/imageView4"
             android:layout_width="@dimen/adapter_header_icon_size"
             android:layout_height="@dimen/adapter_header_icon_size"
-            app:tintType="accent"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/recently_updated"
+            android:transitionName="@string/recently_updated"
             app:srcCompat="@drawable/ic_apps_category_recently_updated"
-            android:transitionName="@string/recently_updated" />
+            app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
             android:id="@+id/typeFaceTextView02"
@@ -56,10 +56,13 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/apps"
-            app:textColorStyle="primary"
             android:textSize="16sp"
-            app:appFontStyle="bold" />
+            app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
+            app:textColorStyle="primary" />
 
     </LinearLayout>
 

diff --git a/app/src/main/res/layout/adapter_header_sensors.xml b/app/src/main/res/layout/adapter_header_sensors.xml
@@ -22,9 +22,9 @@
             android:layout_height="@dimen/adapter_header_icon_size"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/app_name"
+            android:transitionName="@string/sensors"
             app:srcCompat="@drawable/ic_sensors"
-            app:tintType="accent"
-            android:transitionName="@string/sensors" />
+            app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
             android:id="@+id/typeFaceTextView02"
@@ -53,9 +53,12 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/sensors"
             android:textSize="16sp"
             app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
             app:textColorStyle="primary" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView

diff --git a/app/src/main/res/layout/adapter_header_uninstalled.xml b/app/src/main/res/layout/adapter_header_uninstalled.xml
@@ -22,20 +22,20 @@
             android:layout_height="@dimen/adapter_header_icon_size"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/uninstalled"
+            android:transitionName="@string/uninstalled"
             app:srcCompat="@drawable/ic_apps_category_deleted_apps"
-            app:tintType="accent"
-            android:transitionName="@string/uninstalled" />
+            app:tintType="accent" />
 
         <app.simple.inure.decorations.typeface.TypeFaceTextView
             android:id="@+id/typeFaceTextView02"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
+            android:layout_marginHorizontal="16dp"
+            android:layout_weight="1"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
-            android:layout_marginHorizontal="16dp"
-            android:layout_weight="1"
             android:text="@string/uninstalled"
             android:textSize="@dimen/header_font_size"
             app:appFontStyle="light"
@@ -56,9 +56,12 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="8dp"
             android:layout_weight="1"
+            android:drawablePadding="@dimen/popup_padding"
             android:text="@string/apps"
             android:textSize="16sp"
             app:appFontStyle="bold"
+            app:drawableStartCompat="@drawable/ic_numbers_textview"
+            app:drawableTintStyle="accent"
             app:textColorStyle="primary" />
 
     </LinearLayout>

diff --git a/app/src/main/res/layout/dialog_generated_data_type.xml b/app/src/main/res/layout/dialog_generated_data_type.xml
@@ -26,7 +26,7 @@
             android:layout_weight="1"
             android:padding="@dimen/dialog_padding"
             android:text=".TXT"
-            android:textSize="6pt"
+            android:textSize="@dimen/info_text_small"
             app:appFontStyle="bold"
             app:drawableEndCompat="@drawable/ic_arrow_right_tiny"
             app:drawableTintStyle="accent"
@@ -41,7 +41,7 @@
             android:layout_weight="1"
             android:padding="@dimen/dialog_padding"
             android:text=".XML"
-            android:textSize="6pt"
+            android:textSize="@dimen/info_text_small"
             app:appFontStyle="bold"
             app:drawableEndCompat="@drawable/ic_arrow_right_tiny"
             app:drawableTintStyle="accent"

diff --git a/app/src/main/res/layout/dialog_main_settings.xml b/app/src/main/res/layout/dialog_main_settings.xml
@@ -23,7 +23,7 @@
             android:padding="@dimen/dialog_padding"
             android:text="@string/open_application_settings"
             app:textColorStyle="primary"
-            android:textSize="6pt"
+            android:textSize="@dimen/info_text_small"
             app:appFontStyle="bold" />
 
     </app.simple.inure.decorations.corners.DynamicCornerLinearLayout>

diff --git a/.../main/res/layout/dialog_all_apps_menu.xml → .../main/res/layout/dialog_menu_all_apps.xml b/.../main/res/layout/dialog_all_apps_menu.xml → .../main/res/layout/dialog_menu_all_apps.xml
@@ -63,7 +63,7 @@
             android:layout_weight="1"
             android:padding="@dimen/dialog_padding"
             android:text="@string/open_application_settings"
-            android:textSize="6pt"
+            android:textSize="@dimen/info_text_small"
             app:appFontStyle="bold"
             app:drawableEndCompat="@drawable/ic_arrow_right_tiny"
             app:drawableTintStyle="accent"
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ <h4>Bug Fixes</h4> @@
     <ul>
         <li>Fixed various locale issues.</li>
         <li>Fixed bottom menu margin issue.</li>
+        <li>Fixed font size issue in various menus.</li>
     </ul>
     <br>
@@ Expand Down @@