From f372f711419d8b991e66155d1bc967cffd172a81 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 8 Jul 2022 11:39:44 +0200 Subject: [PATCH] updating commons --- app/build.gradle | 2 +- .../applauncher/activities/MainActivity.kt | 54 +++-- .../activities/SettingsActivity.kt | 8 +- .../applauncher/dialogs/EditDialog.kt | 19 +- app/src/main/res/layout/activity_main.xml | 127 +++++++----- app/src/main/res/layout/activity_settings.xml | 185 ++++++++++-------- .../main/res/layout/dialog_edit_launcher.xml | 18 +- .../layout/dialog_edit_launcher_material.xml | 22 --- 8 files changed, 242 insertions(+), 193 deletions(-) delete mode 100644 app/src/main/res/layout/dialog_edit_launcher_material.xml diff --git a/app/build.gradle b/app/build.gradle index e157ffa..734b311 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:c070dff787' + implementation 'com.github.SimpleMobileTools:Simple-Commons:903dad2409' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' } diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt index 4e52c95..c226764 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt @@ -2,8 +2,6 @@ package com.simplemobiletools.applauncher.activities import android.content.Intent import android.os.Bundle -import android.view.Menu -import android.view.MenuItem import com.simplemobiletools.applauncher.BuildConfig import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.adapters.LaunchersAdapter @@ -36,6 +34,9 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + setupOptionsMenu() + refreshMenuItems() + appLaunched(BuildConfig.APPLICATION_ID) setupEmptyView() setupLaunchers() @@ -50,6 +51,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { override fun onResume() { super.onResume() + setupToolbar(main_toolbar) if (mStoredTextColor != getProperTextColor()) { getGridAdapter()?.updateTextColor(getProperTextColor()) } @@ -72,33 +74,49 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { storeStateVariables() } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - menuInflater.inflate(R.menu.menu, menu) + private fun refreshMenuItems() { val currentColumnCount = if (portrait) { config.portraitColumnCnt } else { config.landscapeColumnCnt } - menu.apply { + main_toolbar.menu.apply { findItem(R.id.increase_column_count).isVisible = currentColumnCount < MAX_COLUMN_COUNT findItem(R.id.reduce_column_count).isVisible = currentColumnCount > 1 - updateMenuItemColors(menu) } - return true } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.sort -> showSortingDialog() - R.id.toggle_app_name -> toggleAppName() - R.id.increase_column_count -> increaseColumnCount() - R.id.reduce_column_count -> reduceColumnCount() - R.id.settings -> launchSettings() - R.id.about -> launchAbout() - else -> return super.onOptionsItemSelected(item) + private fun setupOptionsMenu() { + main_toolbar.setOnMenuItemClickListener { menuItem -> + when (menuItem.itemId) { + R.id.sort -> { + showSortingDialog() + true + } + R.id.toggle_app_name -> { + toggleAppName() + true + } + R.id.increase_column_count -> { + increaseColumnCount() + true + } + R.id.reduce_column_count -> { + reduceColumnCount() + true + } + R.id.settings -> { + launchSettings() + true + } + R.id.about -> { + launchAbout() + true + } + else -> false + } } - return true } private fun launchSettings() { @@ -199,7 +217,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun columnCountChanged() { - invalidateOptionsMenu() + refreshMenuItems() getGridAdapter()?.apply { calculateIconWidth() notifyItemRangeChanged(0, launchers.size) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt index 7173d4b..c3f72ba 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt @@ -1,10 +1,10 @@ package com.simplemobiletools.applauncher.activities import android.os.Bundle -import android.view.Menu import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.extensions.config import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.NavigationIcon import kotlinx.android.synthetic.main.activity_settings.* import java.util.* @@ -17,6 +17,7 @@ class SettingsActivity : SimpleActivity() { override fun onResume() { super.onResume() + setupToolbar(settings_toolbar, NavigationIcon.Arrow) setupPurchaseThankYou() setupCustomizeColors() @@ -33,11 +34,6 @@ class SettingsActivity : SimpleActivity() { } } - override fun onCreateOptionsMenu(menu: Menu): Boolean { - updateMenuItemColors(menu) - return super.onCreateOptionsMenu(menu) - } - private fun setupPurchaseThankYou() { settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled()) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/EditDialog.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/EditDialog.kt index 35c8be3..e86180d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/EditDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/EditDialog.kt @@ -1,33 +1,28 @@ package com.simplemobiletools.applauncher.dialogs import android.app.Activity +import android.app.AlertDialog import android.view.ViewGroup -import androidx.appcompat.widget.AppCompatEditText import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.extensions.dbHelper import com.simplemobiletools.applauncher.models.AppLauncher import com.simplemobiletools.commons.extensions.* +import kotlinx.android.synthetic.main.dialog_edit_launcher.view.* class EditDialog(val activity: Activity, val appLauncher: AppLauncher, val callback: () -> Unit) { init { - val layoutId = if (activity.baseConfig.isUsingSystemTheme) { - R.layout.dialog_edit_launcher_material - } else { - R.layout.dialog_edit_launcher - } - - val view = (activity.layoutInflater.inflate(layoutId, null) as ViewGroup) - view.findViewById(R.id.edit_launcher_edittext).setText(appLauncher.title) + val view = (activity.layoutInflater.inflate(R.layout.dialog_edit_launcher, null) as ViewGroup) + view.edit_launcher_edittext.setText(appLauncher.title) activity.getAlertDialogBuilder() .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) .apply { activity.setupDialogStuff(view, this, R.string.rename) { alertDialog -> - alertDialog.showKeyboard(view.findViewById(R.id.edit_launcher_edittext)) - alertDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener { - val newName = view.findViewById(R.id.edit_launcher_edittext).value + alertDialog.showKeyboard(view.edit_launcher_edittext) + alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { + val newName = view.edit_launcher_edittext.value if (!newName.isEmpty()) { if (activity.dbHelper.updateLauncherName(appLauncher.id, newName)) { callback() diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7ed1dbc..04ef745 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,67 +2,98 @@ - - + android:layout_height="?attr/actionBarSize" + android:background="@color/color_primary" + app:menu="@menu/menu" + app:title="@string/app_launcher_name" + app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> - + - + + + android:layout_height="match_parent"> - + android:layout_height="wrap_content"> - - + - + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 00a3a6b..e6211d9 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,109 +1,134 @@ - + android:layout_height="match_parent"> - + android:layout_height="wrap_content"> - + android:layout_height="?attr/actionBarSize" + android:background="@color/color_primary" + app:title="@string/settings" + app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> + + + + - + android:text="@string/color_customization" /> - - - - - - - - - - + android:layout_margin="@dimen/medium_margin" + android:background="@drawable/section_holder_stroke" + android:orientation="vertical"> - - - - - - - + android:background="@drawable/ripple_all_corners"> - + - + + + + android:text="@string/general_settings" /> - + + + android:background="@drawable/ripple_top_corners"> - + + + + + + + + + + + + + + + + - - + + diff --git a/app/src/main/res/layout/dialog_edit_launcher.xml b/app/src/main/res/layout/dialog_edit_launcher.xml index 200f224..f15fb1a 100644 --- a/app/src/main/res/layout/dialog_edit_launcher.xml +++ b/app/src/main/res/layout/dialog_edit_launcher.xml @@ -5,12 +5,18 @@ android:layout_height="wrap_content" android:padding="@dimen/activity_margin"> - + android:layout_height="wrap_content" + android:hint="@string/label"> + + + diff --git a/app/src/main/res/layout/dialog_edit_launcher_material.xml b/app/src/main/res/layout/dialog_edit_launcher_material.xml deleted file mode 100644 index 1df3817..0000000 --- a/app/src/main/res/layout/dialog_edit_launcher_material.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - -