diff --git a/app/build.gradle b/app/build.gradle index 75b94de..2b9f563 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,10 +19,10 @@ android { defaultConfig { applicationId "com.andreacioccarelli.androoster" - minSdkVersion 21 + minSdkVersion 16 targetSdkVersion 35 versionCode 56 - versionName "1.5.3" + versionName "1.5.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/core/HardwareCore.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/core/HardwareCore.kt index 8ddc8cd..a78b9cc 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/core/HardwareCore.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/core/HardwareCore.kt @@ -149,7 +149,7 @@ class HardwareCore { .forName(POWER_PROFILE_CLASS) .getMethod("getAveragePower", java.lang.String::class.java) .invoke(mPowerProfile_, "battery.capacity") as Double - batteryCapacity.toString() + " MAh" + batteryCapacity.toString() + " MA/h" } catch (e: Exception) { e.printStackTrace() "Unknown" diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIBattery.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIBattery.kt index 3835f90..f95d524 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIBattery.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIBattery.kt @@ -64,7 +64,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -483,7 +482,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -555,11 +553,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene LicenseManager.startProActivity(this@UIBattery, this@UIBattery, drawer) false } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIBattery, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -581,7 +574,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -598,7 +590,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -627,7 +618,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -652,7 +642,6 @@ class UIBattery : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UICpu.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UICpu.kt index 6556568..208dbe2 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UICpu.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UICpu.kt @@ -50,7 +50,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -186,7 +185,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -260,12 +258,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UICpu, UIBackup::class.java)) - false - } - - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -288,7 +280,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -305,7 +296,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -334,7 +324,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -359,7 +348,6 @@ class UICpu : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIDebug.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIDebug.kt index 7798a02..1e849d4 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIDebug.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIDebug.kt @@ -52,7 +52,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -234,7 +233,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -335,11 +333,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, } } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIDebug, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -362,7 +355,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -379,7 +371,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -408,7 +399,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -433,7 +423,6 @@ class UIDebug : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGeneral.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGeneral.kt index f9f952b..e5f27f0 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGeneral.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGeneral.kt @@ -45,7 +45,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -184,7 +183,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -254,11 +252,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene false } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIGeneral, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -279,7 +272,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -296,7 +288,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -325,7 +316,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -350,7 +340,6 @@ class UIGeneral : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGps.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGps.kt index 048556a..4a0fccb 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGps.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGps.kt @@ -54,7 +54,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -191,7 +190,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -262,12 +260,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIGps, UIBackup::class.java)) - false - } - - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -290,7 +282,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -307,7 +298,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -336,7 +326,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -361,7 +350,6 @@ class UIGps : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, G DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGraphic.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGraphic.kt index e049e83..9380302 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGraphic.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIGraphic.kt @@ -50,14 +50,14 @@ import kotlinx.coroutines.launch import java.util.* import kotlin.concurrent.schedule -class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, Governors, LaunchStruct { +class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, Governors, + LaunchStruct { internal var pro: Boolean = false internal var drawerInitialized = false internal var doubleBackToExitPressedOnce = false lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -76,7 +76,6 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene } - val fabTop: FloatingActionButton get() = findViewById(R.id.fabTop) val fabBottom: FloatingActionButton get() = findViewById(R.id.fabBottom) val toolbar_layout: CollapsingToolbarLayout get() = findViewById(R.id.toolbar_layout) @@ -99,8 +98,6 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene private val graphBase: ImageView get() = findViewById(R.id.graphBase) - - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.graph) @@ -138,31 +135,32 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene buttonAnimations.setOnClickListener { if (animScaleAnimator.isEmpty() || animScaleTransition.isEmpty() || animScaleAnimator.isEmpty()) { UI.warning(getString(R.string.widget_loading)) - return@setOnClickListener } val dialog = MaterialDialog.Builder(this) - .title(R.string.graphic_anim_title) - .customView(R.layout.edit_seekbar, true) - .cancelListener { - UI.success(getString(R.string.reboot_to_take_effect)) - } - .build() + .title(R.string.graphic_anim_title) + .customView(R.layout.edit_seekbar, true) + .positiveText("SAVE") + .onPositive { dialog, which -> + UI.success(getString(R.string.reboot_to_take_effect)) + } + .cancelable(false) + .build() - val seekBar1 = dialog.customView?.findViewById(R.id.seekBar1) as AppCompatSeekBar - val seekBar2 = dialog.customView?.findViewById(R.id.seekBar2) as AppCompatSeekBar - val seekBar3 = dialog.customView?.findViewById(R.id.seekBar3) as AppCompatSeekBar + val seekBar1 = dialog.customView?.findViewById(R.id.seekBar1) as SeekBar + val seekBar2 = dialog.customView?.findViewById(R.id.seekBar2) as SeekBar + val seekBar3 = dialog.customView?.findViewById(R.id.seekBar3) as SeekBar - val textView1 = dialog.customView?.findViewById(R.id.seek1_textview) as TextView - val textView2 = dialog.customView?.findViewById(R.id.seek2_textview) as TextView - val textView3 = dialog.customView?.findViewById(R.id.seek3_textview) as TextView + val textView1: TextView = dialog.customView?.findViewById(R.id.seek1_textview)!! + val textView2: TextView = dialog.customView?.findViewById(R.id.seek2_textview)!! + val textView3: TextView = dialog.customView?.findViewById(R.id.seek3_textview)!! val dfuText1 = textView1.text.toString() val dfuText2 = textView2.text.toString() val dfuText3 = textView3.text.toString() - textView1.text = "$dfuText1 ($animScaleWindow)" - textView2.text = "$dfuText2 ($animScaleTransition)" - textView3.text = "$dfuText3 ($animScaleAnimator)" + "$dfuText1 ($animScaleWindow)".also { textView1.text = it } + "$dfuText2 ($animScaleTransition)".also { textView2.text = it } + "$dfuText3 ($animScaleAnimator)".also { textView3.text = it } seekBar1.max = 6 seekBar2.max = 6 @@ -207,31 +205,65 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene when (seekBar!!.progress) { 0 -> { animScaleWindow = AnimationStates.STATE_0x0 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_0x0) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_0x0 + ) } + 1 -> { animScaleWindow = AnimationStates.STATE_0x5 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_0x5) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_0x5 + ) } + 2 -> { animScaleWindow = AnimationStates.STATE_1x0 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_1x0) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_1x0 + ) } + 3 -> { animScaleWindow = AnimationStates.STATE_1x5 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_1x5) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_1x5 + ) } + 4 -> { animScaleWindow = AnimationStates.STATE_2x0 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_2x0) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_2x0 + ) } + 5 -> { animScaleWindow = AnimationStates.STATE_2x5 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_2x5) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_2x5 + ) } + 6 -> { animScaleWindow = AnimationStates.STATE_3x0 - TerminalCore.SETTINGS.put("global", "window_animation_scale", AnimationStates.STATE_3x0) + TerminalCore.SETTINGS.put( + "global", + "window_animation_scale", + AnimationStates.STATE_3x0 + ) } } } @@ -240,7 +272,11 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene } @SuppressLint("SetTextI18n") - override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) { + override fun onProgressChanged( + seekBar: SeekBar?, + progress: Int, + fromUser: Boolean + ) { when (progress) { 0 -> textView1.text = "$dfuText1 (${AnimationStates.STATE_0x0})" 1 -> textView1.text = "$dfuText1 (${AnimationStates.STATE_0x5})" @@ -249,7 +285,8 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene 4 -> textView1.text = "$dfuText1 (${AnimationStates.STATE_2x0})" 5 -> textView1.text = "$dfuText1 (${AnimationStates.STATE_2x5})" 6 -> textView1.text = "$dfuText1 (${AnimationStates.STATE_3x0})" - }} + } + } }) @@ -258,31 +295,65 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene when (seekBar!!.progress) { 0 -> { animScaleTransition = AnimationStates.STATE_0x0 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_0x0) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_0x0 + ) } + 1 -> { animScaleTransition = AnimationStates.STATE_0x5 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_0x5) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_0x5 + ) } + 2 -> { animScaleTransition = AnimationStates.STATE_1x0 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_1x0) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_1x0 + ) } + 3 -> { animScaleTransition = AnimationStates.STATE_1x5 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_1x5) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_1x5 + ) } + 4 -> { animScaleTransition = AnimationStates.STATE_2x0 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_2x0) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_2x0 + ) } + 5 -> { animScaleTransition = AnimationStates.STATE_2x5 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_2x5) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_2x5 + ) } + 6 -> { animScaleTransition = AnimationStates.STATE_3x0 - TerminalCore.SETTINGS.put("global", "transition_animation_scale", AnimationStates.STATE_3x0) + TerminalCore.SETTINGS.put( + "global", + "transition_animation_scale", + AnimationStates.STATE_3x0 + ) } } } @@ -290,7 +361,11 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene override fun onStartTrackingTouch(seekBar: SeekBar?) { } - override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) { + override fun onProgressChanged( + seekBar: SeekBar?, + progress: Int, + fromUser: Boolean + ) { when (progress) { 0 -> textView2.text = "$dfuText2 (${AnimationStates.STATE_0x0})" 1 -> textView2.text = "$dfuText2 (${AnimationStates.STATE_0x5})" @@ -299,7 +374,8 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene 4 -> textView2.text = "$dfuText2 (${AnimationStates.STATE_2x0})" 5 -> textView2.text = "$dfuText2 (${AnimationStates.STATE_2x5})" 6 -> textView2.text = "$dfuText2 (${AnimationStates.STATE_3x0})" - }} + } + } }) @@ -308,31 +384,65 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene when (seekBar!!.progress) { 0 -> { animScaleAnimator = AnimationStates.STATE_0x0 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_0x0) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_0x0 + ) } + 1 -> { animScaleAnimator = AnimationStates.STATE_0x5 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_0x5) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_0x5 + ) } + 2 -> { animScaleAnimator = AnimationStates.STATE_1x0 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_1x0) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_1x0 + ) } + 3 -> { animScaleAnimator = AnimationStates.STATE_1x5 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_1x5) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_1x5 + ) } + 4 -> { animScaleAnimator = AnimationStates.STATE_2x0 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_2x0) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_2x0 + ) } + 5 -> { animScaleAnimator = AnimationStates.STATE_2x5 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_2x5) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_2x5 + ) } + 6 -> { animScaleAnimator = AnimationStates.STATE_3x0 - TerminalCore.SETTINGS.put("global", "animator_duration_scale", AnimationStates.STATE_3x0) + TerminalCore.SETTINGS.put( + "global", + "animator_duration_scale", + AnimationStates.STATE_3x0 + ) } } } @@ -340,7 +450,11 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene override fun onStartTrackingTouch(seekBar: SeekBar?) { } - override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) { + override fun onProgressChanged( + seekBar: SeekBar?, + progress: Int, + fromUser: Boolean + ) { when (progress) { 0 -> textView3.text = "$dfuText3 (${AnimationStates.STATE_0x0})" 1 -> textView3.text = "$dfuText3 (${AnimationStates.STATE_0x5})" @@ -408,7 +522,7 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene preferencesBuilder.putBoolean("GPU5", false) } } - + SwitchGraph1.isChecked = preferencesBuilder.getBoolean("GPU1", false) SwitchGraph2.isChecked = preferencesBuilder.getBoolean("GPU2", false) SwitchGraph3.isChecked = preferencesBuilder.getBoolean("GPU3", false) @@ -443,9 +557,13 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene CoroutineScope(Dispatchers.Main).launch { findViewById(R.id.dashboard_graph_content).text = - getString(R.string.graphic_widget_opengl) + " $glversion.0\n" + - getString(R.string.graphic_widget_resolution) + " ${resources.displayMetrics.heightPixels}${'x'}${resources.displayMetrics.widthPixels}\n" + - getString(R.string.graphic_widget_density) + " ${(resources.displayMetrics.density * 160f).toInt()}${getString(R.string.graphic_dpi_suffix)}" + getString(R.string.graphic_widget_opengl) + " $glversion.0\n" + + getString(R.string.graphic_widget_resolution) + " ${resources.displayMetrics.heightPixels}${'x'}${resources.displayMetrics.widthPixels}\n" + + getString(R.string.graphic_widget_density) + " ${(resources.displayMetrics.density * 160f).toInt()}${ + getString( + R.string.graphic_dpi_suffix + ) + }" } } } @@ -454,7 +572,11 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene super.onResume() FabManager.onResume(fabTop, fabBottom, preferencesBuilder) if (pro && drawerInitialized) { - if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.STICKY_SETTINGS, false)) { + if (preferencesBuilder.getPreferenceBoolean( + SettingStore.GENERAL.STICKY_SETTINGS, + false + ) + ) { drawer.removeAllStickyFooterItems() drawer.removeItem(20) drawer.addStickyFooterItem(DRAWER_SETTINGS) @@ -465,14 +587,14 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } } try { SettingsReflector.updateMenu(menu!!, preferencesBuilder) - } catch (_: NullPointerException) {} + } catch (_: NullPointerException) { + } } @@ -480,71 +602,84 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DrawerBuilder().withActivity(this@UIGraphic).build() - val DRAWER_DASHBOARD = PrimaryDrawerItem().withIdentifier(1).withName(R.string.drawer_dashboard).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.DASHBOARD_ACTIVITY) - false - } - val DRAWER_CPU = PrimaryDrawerItem().withIdentifier(2).withName(R.string.drawer_cpu).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.CPU_ACTIVITY) - false - } - val DRAWER_RAM = PrimaryDrawerItem().withIdentifier(3).withName(R.string.drawer_ram).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.RAM_ACTIVITY) - false - } - val DRAWER_BATTERY = PrimaryDrawerItem().withIdentifier(4).withName(R.string.drawer_battery).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.BATTERY_ACTIVITY) - false - } - val DRAWER_KERNEL = PrimaryDrawerItem().withIdentifier(5).withName(R.string.drawer_kernel).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.KERNEL_ACTIVITY) - false - } - val DRAWER_TWEAKS = PrimaryDrawerItem().withIdentifier(6).withName(R.string.drawer_tweaks).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.GENERAL_ACTIVITY) - false - } - val DRAWER_STORAGE = PrimaryDrawerItem().withIdentifier(7).withName(R.string.drawer_storage).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.STORAGE_ACTIVITY) - false - } - val DRAWER_INTERNET = PrimaryDrawerItem().withIdentifier(8).withName(R.string.drawer_net).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.INTERNET_ACTIVITY) - false - } - val DRAWER_DEBUG = PrimaryDrawerItem().withIdentifier(9).withName(R.string.drawer_debug).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.DEBUG_ACTIVITY) - false - } - val DRAWER_GPS = PrimaryDrawerItem().withIdentifier(11).withName(R.string.drawer_gps).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.GPS_ACTIVITY) - false - } - val DRAWER_HARDWARE = PrimaryDrawerItem().withIdentifier(12).withName(R.string.drawer_hardware).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.HARDWARE_ACTIVITY) - false - } - val DRAWER_GRAPHICS = PrimaryDrawerItem().withIdentifier(13).withName(R.string.drawer_graphics) - val DRAWER_ABOUT = PrimaryDrawerItem().withIdentifier(14).withName(R.string.drawer_about).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.ABOUT_ACTIVITY) - false - } - val DRAWER_BUY_PRO_VERSION = PrimaryDrawerItem().withIdentifier(15).withName(R.string.drawer_pro).withOnDrawerItemClickListener { _, _, _ -> - LicenseManager.startProActivity(this@UIGraphic, this@UIGraphic, drawer) - false - } - + val DRAWER_DASHBOARD = + PrimaryDrawerItem().withIdentifier(1).withName(R.string.drawer_dashboard) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.DASHBOARD_ACTIVITY) + false + } + val DRAWER_CPU = PrimaryDrawerItem().withIdentifier(2).withName(R.string.drawer_cpu) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.CPU_ACTIVITY) + false + } + val DRAWER_RAM = PrimaryDrawerItem().withIdentifier(3).withName(R.string.drawer_ram) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.RAM_ACTIVITY) + false + } + val DRAWER_BATTERY = PrimaryDrawerItem().withIdentifier(4).withName(R.string.drawer_battery) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.BATTERY_ACTIVITY) + false + } + val DRAWER_KERNEL = PrimaryDrawerItem().withIdentifier(5).withName(R.string.drawer_kernel) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.KERNEL_ACTIVITY) + false + } + val DRAWER_TWEAKS = PrimaryDrawerItem().withIdentifier(6).withName(R.string.drawer_tweaks) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.GENERAL_ACTIVITY) + false + } + val DRAWER_STORAGE = PrimaryDrawerItem().withIdentifier(7).withName(R.string.drawer_storage) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.STORAGE_ACTIVITY) + false + } + val DRAWER_INTERNET = PrimaryDrawerItem().withIdentifier(8).withName(R.string.drawer_net) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.INTERNET_ACTIVITY) + false + } + val DRAWER_DEBUG = PrimaryDrawerItem().withIdentifier(9).withName(R.string.drawer_debug) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.DEBUG_ACTIVITY) + false + } + val DRAWER_GPS = PrimaryDrawerItem().withIdentifier(11).withName(R.string.drawer_gps) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.GPS_ACTIVITY) + false + } + val DRAWER_HARDWARE = + PrimaryDrawerItem().withIdentifier(12).withName(R.string.drawer_hardware) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.HARDWARE_ACTIVITY) + false + } + val DRAWER_GRAPHICS = + PrimaryDrawerItem().withIdentifier(13).withName(R.string.drawer_graphics) + val DRAWER_ABOUT = PrimaryDrawerItem().withIdentifier(14).withName(R.string.drawer_about) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.ABOUT_ACTIVITY) + false + } + val DRAWER_BUY_PRO_VERSION = + PrimaryDrawerItem().withIdentifier(15).withName(R.string.drawer_pro) + .withOnDrawerItemClickListener { _, _, _ -> + LicenseManager.startProActivity(this@UIGraphic, this@UIGraphic, drawer) + false + } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIGraphic, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> - handleIntent(LaunchStruct.SETTINGS_ACTIVITY) - false - } + DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings) + .withOnDrawerItemClickListener { _, _, _ -> + handleIntent(LaunchStruct.SETTINGS_ACTIVITY) + false + } if (!preferencesBuilder.getBoolean(XmlKeys.DARK_THEME_APPLIED, false)) { @@ -562,7 +697,6 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -579,66 +713,70 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } val factory = layoutInflater val DrawerHeader = factory.inflate(R.layout.drawer_header, null) - BaseActivity.setDrawerHeader(DrawerHeader.findViewById(R.id.Title), DrawerHeader.findViewById(R.id.Content), DrawerHeader.findViewById(R.id.Image), DrawerHeader.findViewById(R.id.RootLayout), this@UIGraphic, pro) + BaseActivity.setDrawerHeader( + DrawerHeader.findViewById(R.id.Title), + DrawerHeader.findViewById(R.id.Content), + DrawerHeader.findViewById(R.id.Image), + DrawerHeader.findViewById(R.id.RootLayout), + this@UIGraphic, + pro + ) if (pro) { drawer = DrawerBuilder() - .withActivity(this@UIGraphic) - .withToolbar(toolbar) - .addDrawerItems( - DRAWER_GRAPHICS, - DRAWER_DASHBOARD, - DividerDrawerItem(), - DRAWER_CPU, - DRAWER_RAM, - DRAWER_BATTERY, - DRAWER_KERNEL, - DRAWER_TWEAKS, - DRAWER_STORAGE, - DRAWER_INTERNET, - DRAWER_DEBUG, - DRAWER_GPS, - DRAWER_HARDWARE, - DividerDrawerItem(), - DRAWER_BACKUP, - DRAWER_ABOUT, - DRAWER_SETTINGS - ) - .withHeader(DrawerHeader) - .build() + .withActivity(this@UIGraphic) + .withToolbar(toolbar) + .addDrawerItems( + DRAWER_GRAPHICS, + DRAWER_DASHBOARD, + DividerDrawerItem(), + DRAWER_CPU, + DRAWER_RAM, + DRAWER_BATTERY, + DRAWER_KERNEL, + DRAWER_TWEAKS, + DRAWER_STORAGE, + DRAWER_INTERNET, + DRAWER_DEBUG, + DRAWER_GPS, + DRAWER_HARDWARE, + DividerDrawerItem(), + DRAWER_ABOUT, + DRAWER_SETTINGS + ) + .withHeader(DrawerHeader) + .build() } else { drawer = DrawerBuilder() - .withActivity(this@UIGraphic) - .withToolbar(toolbar) - .addDrawerItems( - DRAWER_GRAPHICS, - DRAWER_DASHBOARD, - DividerDrawerItem(), - DRAWER_CPU, - DRAWER_RAM, - DRAWER_BATTERY, - DRAWER_KERNEL, - DRAWER_TWEAKS, - DRAWER_STORAGE, - DRAWER_INTERNET, - DRAWER_DEBUG, - DRAWER_GPS, - DRAWER_HARDWARE, - DividerDrawerItem(), - DRAWER_BACKUP, - DRAWER_ABOUT, - DRAWER_SETTINGS - ) - .withHeader(DrawerHeader) - .build() + .withActivity(this@UIGraphic) + .withToolbar(toolbar) + .addDrawerItems( + DRAWER_GRAPHICS, + DRAWER_DASHBOARD, + DividerDrawerItem(), + DRAWER_CPU, + DRAWER_RAM, + DRAWER_BATTERY, + DRAWER_KERNEL, + DRAWER_TWEAKS, + DRAWER_STORAGE, + DRAWER_INTERNET, + DRAWER_DEBUG, + DRAWER_GPS, + DRAWER_HARDWARE, + DividerDrawerItem(), + DRAWER_ABOUT, + DRAWER_SETTINGS + ) + .withHeader(DrawerHeader) + .build() } drawerInitialized = true } @@ -655,12 +793,16 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene closeApp() return } - if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.PRESS_TWICE_TO_EXIT, false)) { + if (preferencesBuilder.getPreferenceBoolean( + SettingStore.GENERAL.PRESS_TWICE_TO_EXIT, + false + ) + ) { this.doubleBackToExitPressedOnce = true val UI = UI(this@UIGraphic) UI.normal(getString(R.string.click_again_to_exit)) - Timer().schedule(1500){ doubleBackToExitPressedOnce = false } + Timer().schedule(1500) { doubleBackToExitPressedOnce = false } } else { super.onBackPressed() } @@ -671,11 +813,16 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene menuInflater.inflate(R.menu.overflow, menu) this.menu = menu menu.getItem(0).isVisible = true - menu.getItem(1).isVisible = preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.ABOUT, true) - menu.getItem(2).isVisible = preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.DASHBOARD, true) - menu.getItem(3).isVisible = preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.OPEN_DRAWER, true) - menu.getItem(4).isVisible = preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.BACKUP, false) - menu.getItem(5).isVisible = preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.REBOOT, false) + menu.getItem(1).isVisible = + preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.ABOUT, true) + menu.getItem(2).isVisible = + preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.DASHBOARD, true) + menu.getItem(3).isVisible = + preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.OPEN_DRAWER, true) + menu.getItem(4).isVisible = + preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.BACKUP, false) + menu.getItem(5).isVisible = + preferencesBuilder.getPreferenceBoolean(SettingStore.MENU.REBOOT, false) return true } @@ -687,22 +834,27 @@ class UIGraphic : BaseActivity(), NavigationView.OnNavigationItemSelectedListene startActivity(Intent(this@UIGraphic, UIAbout::class.java)) return true } + R.id.menu_dashboard -> { startActivity(Intent(this@UIGraphic, UIDashboard::class.java)) return true } + R.id.menu_settings -> { startActivity(Intent(this@UIGraphic, UISettings::class.java)) return true } + R.id.menu_drawer -> { drawer.openDrawer() return true } + R.id.menu_backup -> { startActivity(Intent(this@UIGraphic, UIBackup::class.java)) return true } + R.id.menu_reboot -> { RebootDialog.show(this) return true diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIHardware.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIHardware.kt index 1ec6c6f..3511f45 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIHardware.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIHardware.kt @@ -62,7 +62,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen internal var pro: Boolean = false lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null var isInBatterySavingMode = false @@ -206,7 +205,16 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen } CoroutineScope(Dispatchers.Main).launch { - isInBatterySavingMode = Integer.valueOf(CoreBase.SETTINGS.get(FrameworkSurface.GLOBAL, "low_power")) == 1 + try { + isInBatterySavingMode = Integer.valueOf( + CoreBase.SETTINGS.get( + FrameworkSurface.GLOBAL, + "low_power" + ) + ) == 1 + } catch (e: RuntimeException) { + + } } SwitchHardware6.setOnClickListener { _ -> @@ -381,7 +389,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -450,11 +457,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIHardware, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) @@ -477,7 +479,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -494,7 +495,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -523,7 +523,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen DRAWER_GPS, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -548,7 +547,6 @@ class UIHardware : BaseActivity(), NavigationView.OnNavigationItemSelectedListen DRAWER_GPS, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIKernel.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIKernel.kt index a33d55a..8a0d7aa 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIKernel.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIKernel.kt @@ -65,7 +65,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -370,7 +369,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -444,12 +442,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIKernel, UIBackup::class.java)) - false - } - - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -471,7 +463,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -488,7 +479,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -517,7 +507,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -542,7 +531,6 @@ class UIKernel : BaseActivity(), NavigationView.OnNavigationItemSelectedListener DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UINetworking.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UINetworking.kt index 1aabea1..7b877f5 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UINetworking.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UINetworking.kt @@ -60,7 +60,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -398,7 +397,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -466,11 +464,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UINetworking, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) @@ -493,7 +486,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -510,7 +502,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -538,7 +529,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -563,7 +553,6 @@ class UINetworking : BaseActivity(), NavigationView.OnNavigationItemSelectedList DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIRam.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIRam.kt index 57bec78..c98b8d4 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIRam.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIRam.kt @@ -58,7 +58,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F lateinit var UI: UI lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - lateinit var DRAWER_BACKUP: PrimaryDrawerItem lateinit var drawer: Drawer var menu: Menu? = null @@ -539,7 +538,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -607,11 +605,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup).withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIRam, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings).withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) false @@ -633,7 +626,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -650,7 +642,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -679,7 +670,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -704,7 +694,6 @@ class UIRam : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, F DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIStorage.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIStorage.kt index 3f9c688..9a1f5da 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIStorage.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/UIStorage.kt @@ -22,6 +22,7 @@ import android.view.MenuItem import android.view.View import android.view.ViewGroup import android.widget.ImageView +import android.widget.RelativeLayout import android.widget.TextView import com.afollestad.materialdialogs.MaterialDialog import com.andreacioccarelli.androoster.R @@ -57,7 +58,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene LaunchStruct { internal lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - internal lateinit var DRAWER_BACKUP: PrimaryDrawerItem internal var drwInitialized = false internal var pro: Boolean = false @@ -86,7 +86,7 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene private val spinnerRAM1: AppCompatSpinner get() = findViewById(R.id.spinnerRAM1) private val storageBase: ImageView get() = findViewById(R.id.storageBase) - private val appSdmaidLayoutIcon: ImageView get() = findViewById(R.id.appSdmaidLayoutIcon) + private val appSdmaidLayoutIcon: RelativeLayout get() = findViewById(R.id.appSdmaidLayoutIcon) private val TitleROM2: TextView get() = findViewById(R.id.TitleROM2) private val TitleROM3: TextView get() = findViewById(R.id.TitleROM3) @@ -368,7 +368,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, false)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -470,12 +469,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene } - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup) - .withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIStorage, UIBackup::class.java)) - false - } - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings) .withOnDrawerItemClickListener { _, _, _ -> @@ -499,7 +492,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -516,7 +508,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -552,7 +543,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -577,7 +567,6 @@ class UIStorage : BaseActivity(), NavigationView.OnNavigationItemSelectedListene DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/about/UIAbout.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/about/UIAbout.kt index 8172f67..fe82f25 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/about/UIAbout.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/about/UIAbout.kt @@ -9,6 +9,7 @@ import android.net.Uri import android.os.Bundle import android.provider.Settings import android.support.customtabs.CustomTabsIntent +import android.support.v7.widget.AppCompatButton import android.support.v7.widget.CardView import android.support.v7.widget.DefaultItemAnimator import android.support.v7.widget.LinearLayoutManager @@ -143,9 +144,9 @@ class UIAbout : BaseActivity(), View.OnClickListener { findViewById(R.id.writeMail).setOnClickListener(this) findViewById(R.id.followOnGithub).setOnClickListener(this) findViewById(R.id.followOnTwitter).setOnClickListener(this) - findViewById(R.id.aidanFollestadTwitter).setOnClickListener(this) - findViewById(R.id.aidanFollestadGitHub).setOnClickListener(this) - findViewById(R.id.karimGitHub).setOnClickListener(this) + findViewById(R.id.aidanFollestadTwitter).setOnClickListener(this) + findViewById(R.id.aidanFollestadGitHub).setOnClickListener(this) + findViewById(R.id.karimGitHub).setOnClickListener(this) } override fun onOptionsItemSelected(item: MenuItem): Boolean { @@ -173,9 +174,9 @@ class UIAbout : BaseActivity(), View.OnClickListener { } findViewById(R.id.followOnGithub) -> openUrl(GITHUB) findViewById(R.id.followOnTwitter) -> openUrl(TWITTER) - findViewById(R.id.aidanFollestadTwitter) -> openUrl(SPECIAL_THANKS.AIDAN_FOLLESTAD_TWITTER) - findViewById(R.id.aidanFollestadGitHub) -> openUrl(SPECIAL_THANKS.AIDAN_FOLLESTAD_GITHUB) - findViewById(R.id.karimGitHub) -> openUrl(SPECIAL_THANKS.KARIM_ABOU_GITHUB) + findViewById(R.id.aidanFollestadTwitter) -> openUrl(SPECIAL_THANKS.AIDAN_FOLLESTAD_TWITTER) + findViewById(R.id.aidanFollestadGitHub) -> openUrl(SPECIAL_THANKS.AIDAN_FOLLESTAD_GITHUB) + findViewById(R.id.karimGitHub) -> openUrl(SPECIAL_THANKS.KARIM_ABOU_GITHUB) } } diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/base/BaseActivity.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/base/BaseActivity.kt index 8777755..ac05bb7 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/base/BaseActivity.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/base/BaseActivity.kt @@ -102,9 +102,9 @@ open class BaseActivity : ATHToolbarActivity(), FrameworkSurface { ThemeStore.editTheme(this) .activityTheme(R.style.Theme_Androoster_Light) .coloredNavigationBar(preferencesBuilder.getBoolean("coloredNavigationBar", false)) - .primaryColorRes(R.color.primary) - .statusBarColor(ContextCompat.getColor(baseContext, R.color.primary)) - .accentColorRes(R.color.accent) + .primaryColorRes(R.color.BlueGrey_800) + .statusBarColor(ContextCompat.getColor(baseContext, R.color.BlueGrey_500)) + .accentColorRes(R.color.Blue_500) .commit() } } diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/boot/UIBoot.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/boot/UIBoot.kt index 5296147..ace1cb5 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/boot/UIBoot.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/boot/UIBoot.kt @@ -372,7 +372,8 @@ class UIBoot : BaseActivity(), LaunchStruct { CoroutineScope(Dispatchers.Main).launch { if (COMPATIBILITY_MODE) { - Toasty.warning(this@UIBoot, "Root not detected, application running in compatibility mode", Toast.LENGTH_LONG).show() + Toasty.error(this@UIBoot, "Root access not detected! Application running in compatibility mode", Toast.LENGTH_LONG).show() + Toasty.warning(this@UIBoot, "Tweaks will not work, no root access detected/granted", Toast.LENGTH_LONG).show() bootApp() } else { checkRootStrict() diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/dashboard/UIDashboard.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/dashboard/UIDashboard.kt index 189a05d..fdb1e21 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/dashboard/UIDashboard.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/dashboard/UIDashboard.kt @@ -17,7 +17,9 @@ import android.support.v7.widget.CardView import android.support.v7.widget.Toolbar import android.view.* import android.widget.ImageView +import android.widget.RelativeLayout import android.widget.TextView +import android.widget.Toast import com.afollestad.materialdialogs.MaterialDialog import com.andreacioccarelli.androoster.R import com.andreacioccarelli.androoster.core.HardwareCore @@ -30,6 +32,7 @@ import com.andreacioccarelli.androoster.ui.base.BaseActivity import com.andreacioccarelli.androoster.ui.settings.SettingStore import com.andreacioccarelli.androoster.ui.settings.SettingsReflector import com.andreacioccarelli.androoster.ui.settings.UISettings +import com.andreacioccarelli.androoster.ui.upgrade.UIUpgrade import com.jaredrummler.android.device.DeviceName import com.kabouzeid.appthemehelper.ATH import com.kabouzeid.appthemehelper.ThemeStore @@ -38,13 +41,13 @@ import com.mikepenz.materialdrawer.Drawer import com.mikepenz.materialdrawer.DrawerBuilder import com.mikepenz.materialdrawer.model.DividerDrawerItem import com.mikepenz.materialdrawer.model.PrimaryDrawerItem +import es.dmoral.toasty.Toasty import java.util.* class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListener, LaunchStruct { private var networkAvailable = true private lateinit var DRAWER_SETTINGS: PrimaryDrawerItem - private lateinit var DRAWER_BACKUP: PrimaryDrawerItem private var drawerInitialized = false lateinit var drawer: Drawer @@ -164,19 +167,27 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe // Free pack if (!prefs.getBoolean("notified_pro_version", false) && !prefs.getBoolean("pro", false)) { + Toasty.success(this, "Pro version available!", Toast.LENGTH_LONG).show() + MaterialDialog.Builder(this) - .title("Free Androoster Pro") + .title("Androoster Pro") .content( """Androoster has just become free. - |You can enable pro version by visiting the upgrade page and clicking the upgrade button, no purchase is required anymore. - |This software has been around for a long time and I felt it was time to make it available for everyone. - |Thank you very much to everybody who supported my work through purchases, and I wish you all happy tweaking and learning.""".trimMargin() + |You can enable pro version by visiting the upgrade page, and clicking the upgrade button, no purchase is required anymore. + |This software has been around for a long time, and I felt it was time to make it available for everyone.\n + |Thank you very much to everybody who supported my work through purchases, and I wish you all happy tweaking and exploring!""".trimMargin() ) - .positiveText("COOL") - .onPositive { dialog, which -> + .negativeText("GOT IT") + .positiveText("OPEN UPGRADE") + .positiveColorRes(R.color.Green_500) + .onNegative() { dialog, which -> dialog.dismiss() prefs.putBoolean("notified_pro_version", true) } + .onPositive() { dialog, which -> + prefs.putBoolean("notified_pro_version", true) + startActivity(Intent(this, UIUpgrade::class.java)) + } .autoDismiss(false) .cancelable(false) .show() @@ -206,7 +217,6 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe } if (preferencesBuilder.getPreferenceBoolean(SettingStore.GENERAL.SHOW_BACKUP, true)) { drawer.removeItem(19) - drawer.addItemAtPosition(DRAWER_BACKUP, 16) } else { drawer.removeItem(19) } @@ -233,7 +243,7 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe setColorFilter(ThemeStore.accentColor(this@UIDashboard)) } - findViewById(R.id.recentLayout1).setOnClickListener { _ -> + findViewById(R.id.recentLayout1).setOnClickListener { _ -> startActivity( dispatcher.getIntent(first) ) @@ -247,7 +257,7 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe setColorFilter(ThemeStore.accentColor(this@UIDashboard)) } - findViewById(R.id.recentLayout2).setOnClickListener { _ -> + findViewById(R.id.recentLayout2).setOnClickListener { _ -> startActivity( dispatcher.getIntent(second) ) @@ -261,7 +271,7 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe setColorFilter(ThemeStore.accentColor(this@UIDashboard)) } - findViewById(R.id.recentLayout3).setOnClickListener { _ -> startActivity(dispatcher.getIntent(third)) } + findViewById(R.id.recentLayout3).setOnClickListener { _ -> startActivity(dispatcher.getIntent(third)) } findViewById(R.id.recentText3).text = getString(dispatcher.getTitleRes(third)).toUpperCase(locale) } catch (rnf: IllegalStateException) { findViewById(R.id.recentWidget).visibility = View.GONE @@ -359,14 +369,6 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe false } - - DRAWER_BACKUP = PrimaryDrawerItem().withIdentifier(19L).withName(R.string.drawer_backup) - .withOnDrawerItemClickListener { _, _, _ -> - startActivity(Intent(this@UIDashboard, UIBackup::class.java)) - false - } - - DRAWER_SETTINGS = PrimaryDrawerItem().withIdentifier(20).withName(R.string.drawer_settings) .withOnDrawerItemClickListener { _, _, _ -> handleIntent(LaunchStruct.SETTINGS_ACTIVITY) @@ -388,7 +390,6 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe DRAWER_GRAPHICS.withIcon(R.drawable.drawer_black_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_black_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_black_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_black) DRAWER_ABOUT.withIcon(R.drawable.drawer_black_about) } else { DRAWER_DASHBOARD.withIcon(R.drawable.drawer_white_dashboard) @@ -405,7 +406,6 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe DRAWER_GRAPHICS.withIcon(R.drawable.drawer_white_graphic) DRAWER_SETTINGS.withIcon(R.drawable.drawer_white_settings) DRAWER_BUY_PRO_VERSION.withIcon(R.drawable.drawer_white_buy) - DRAWER_BACKUP.withIcon(R.drawable.drawer_backup_white) DRAWER_ABOUT.withIcon(R.drawable.drawer_white_about) } @@ -439,7 +439,6 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) @@ -464,7 +463,6 @@ class UIDashboard : BaseActivity(), NavigationView.OnNavigationItemSelectedListe DRAWER_HARDWARE, DRAWER_GRAPHICS, DividerDrawerItem(), - DRAWER_BACKUP, DRAWER_ABOUT, DRAWER_SETTINGS ) diff --git a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/upgrade/UIUpgrade.kt b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/upgrade/UIUpgrade.kt index 2195480..72a559c 100644 --- a/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/upgrade/UIUpgrade.kt +++ b/app/src/main/kotlin/com/andreacioccarelli/androoster/ui/upgrade/UIUpgrade.kt @@ -9,6 +9,7 @@ import android.support.v7.widget.Toolbar import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import android.widget.Toast import com.afollestad.materialdialogs.MaterialDialog import com.andreacioccarelli.androoster.R import com.andreacioccarelli.androoster.tools.GradientGenerator @@ -17,6 +18,7 @@ import com.andreacioccarelli.androoster.tools.UI import com.andreacioccarelli.androoster.ui.base.BaseActivity import com.kabouzeid.appthemehelper.ATH import com.kabouzeid.appthemehelper.ThemeStore +import es.dmoral.toasty.Toasty class UIUpgrade : BaseActivity() { @@ -37,6 +39,8 @@ class UIUpgrade : BaseActivity() { setupToolbar() setupTheme() setupViews() + + findViewById(R.id.upgradeButton).performClick() } private fun setupToolbar() { @@ -78,13 +82,15 @@ class UIUpgrade : BaseActivity() { @Suppress("WhenWithOnlyElse") private fun setupViews() { - findViewById(R.id.upgradeButton).setOnClickListener { + findViewById(R.id.upgradeButton).setOnClickListener { PreferencesBuilder(this, PreferencesBuilder.defaultFilename).putBoolean("pro", true) + Toasty.success(this, "Pro version activated!", Toast.LENGTH_SHORT).show() + MaterialDialog.Builder(this) .title("Androoster Pro Enabled") - .content("Thank you! Androoster Pro has been activated. Just restart the app and enjoy all the professional features.") - .positiveText("OK") + .content("Thank you! Androoster Pro has been activated.\nRestart the app and enjoy all the professional features.") + .positiveText("RESTART APP") .onPositive { dialog, which -> dialog.dismiss() finishAffinity() diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml index 883ae45..2cb4d72 100644 --- a/app/src/main/res/layout/card_about_app.xml +++ b/app/src/main/res/layout/card_about_app.xml @@ -134,7 +134,7 @@