From 5fe9d66497018da5cb83991fe524b4ea6c1e453a Mon Sep 17 00:00:00 2001 From: Steven Schoen Date: Wed, 1 Jul 2015 01:00:42 -0400 Subject: [PATCH] Use AppCompat, minor changes --- Emoji Switcher/build.gradle | 4 +-- .../emojiswitcher/EmojiSwitcherUtils.java | 8 ++--- .../emojiswitcher/SwitcherActivity.java | 9 ++--- .../src/main/res/drawable/button.xml | 35 ------------------- .../src/main/res/drawable/button_round.xml | 4 +-- .../res/layout/activity_emojiswitcher.xml | 8 +++-- .../src/main/res/values-v21/styles.xml | 16 --------- Emoji Switcher/src/main/res/values/styles.xml | 25 ++++++------- 8 files changed, 29 insertions(+), 80 deletions(-) delete mode 100644 Emoji Switcher/src/main/res/drawable/button.xml delete mode 100644 Emoji Switcher/src/main/res/values-v21/styles.xml diff --git a/Emoji Switcher/build.gradle b/Emoji Switcher/build.gradle index 85970f6..604dba2 100644 --- a/Emoji Switcher/build.gradle +++ b/Emoji Switcher/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 19 targetSdkVersion 22 - versionCode 9 - versionName "1.6.1" + versionCode 10 + versionName "1.6.2" } compileOptions { diff --git a/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/EmojiSwitcherUtils.java b/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/EmojiSwitcherUtils.java index c322eb4..63ece69 100644 --- a/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/EmojiSwitcherUtils.java +++ b/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/EmojiSwitcherUtils.java @@ -10,10 +10,10 @@ import android.os.Build; import android.widget.Toast; +import com.stericson.RootShell.exceptions.RootDeniedException; +import com.stericson.RootShell.execution.Command; +import com.stericson.RootShell.execution.Shell; import com.stericson.RootTools.RootTools; -import com.stericson.RootTools.exceptions.RootDeniedException; -import com.stericson.RootTools.execution.CommandCapture; -import com.stericson.RootTools.execution.Shell; import org.apache.commons.io.FileUtils; @@ -81,7 +81,7 @@ public static void applyPermissions(final Activity activity, String permissions, try { RootTools.remount(path, "RW"); Shell shell = RootTools.getShell(true); - CommandCapture commandPermission = new CommandCapture(0, "chmod " + permissions + " " + path); + Command commandPermission = new Command(0, "chmod " + permissions + " " + path); shell.add(commandPermission); shell.close(); } catch (TimeoutException e) { diff --git a/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/SwitcherActivity.java b/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/SwitcherActivity.java index 4ee68c0..ef89cd4 100644 --- a/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/SwitcherActivity.java +++ b/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/SwitcherActivity.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -33,7 +34,7 @@ import java.util.ArrayList; import java.util.List; -public class SwitcherActivity extends Activity { +public class SwitcherActivity extends AppCompatActivity { private TextView textCurrentEmojiSet; private ImageButton buttonRefreshEmojiState; @@ -79,7 +80,7 @@ public void onClick(View v) { emojiSetsAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinnerInstallEmojis.setAdapter(emojiSetsAdapter); - final Button buttonReboot = (Button) findViewById(R.id.button_reboot); + Button buttonReboot = (Button) findViewById(R.id.button_reboot); buttonReboot.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -93,7 +94,7 @@ public void onClick(View v) { public void onClick(View v) { emojiSwitcherUtils.installEmojiSet(SwitcherActivity.this, (EmojiSet) spinnerInstallEmojis.getSelectedItem()); refreshCurrentSystemEmojiSet(); - emojiSwitcherUtils.makeRebootDialog(SwitcherActivity.this).show(); + EmojiSwitcherUtils.makeRebootDialog(SwitcherActivity.this).show(); } }); @@ -233,7 +234,7 @@ public void onIabSetupFinished(IabResult result) { } private void checkAds() { - List additionalSkuList = new ArrayList(); + List additionalSkuList = new ArrayList<>(); additionalSkuList.add(EmojiSwitcherUtils.SKU_REMOVEADS); billingHelper.queryInventoryAsync(true, additionalSkuList, new IabHelper.QueryInventoryFinishedListener() { diff --git a/Emoji Switcher/src/main/res/drawable/button.xml b/Emoji Switcher/src/main/res/drawable/button.xml deleted file mode 100644 index 2997a67..0000000 --- a/Emoji Switcher/src/main/res/drawable/button.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Emoji Switcher/src/main/res/drawable/button_round.xml b/Emoji Switcher/src/main/res/drawable/button_round.xml index e90edd7..5c27500 100644 --- a/Emoji Switcher/src/main/res/drawable/button_round.xml +++ b/Emoji Switcher/src/main/res/drawable/button_round.xml @@ -18,7 +18,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/Emoji Switcher/src/main/res/layout/activity_emojiswitcher.xml b/Emoji Switcher/src/main/res/layout/activity_emojiswitcher.xml index 08c05b8..d42a3b8 100644 --- a/Emoji Switcher/src/main/res/layout/activity_emojiswitcher.xml +++ b/Emoji Switcher/src/main/res/layout/activity_emojiswitcher.xml @@ -52,13 +52,13 @@ + android:src="@drawable/ic_refresh" />