From e755446c5f750691422eb32a2438916f4440c454 Mon Sep 17 00:00:00 2001 From: Ender's Games Date: Mon, 20 Aug 2018 23:27:29 -0400 Subject: [PATCH] Android: Remove redundancy, Eliminate hash file --- shell/android-studio/reicast/build.gradle | 12 ++-- .../com/reicast/emulator/AboutFragment.java | 30 ++------- .../reicast/emulator/debug/GitAdapter.java | 5 +- .../src/main/res/layout/about_fragment.xml | 11 --- .../src/main/res/menu-v23/activity_main.xml | 67 +++++++++---------- .../src/main/res/menu/activity_main.xml | 12 ++-- 6 files changed, 48 insertions(+), 89 deletions(-) diff --git a/shell/android-studio/reicast/build.gradle b/shell/android-studio/reicast/build.gradle index 802a62da9..344a93b11 100644 --- a/shell/android-studio/reicast/build.gradle +++ b/shell/android-studio/reicast/build.gradle @@ -67,14 +67,10 @@ android { afterEvaluate { android.applicationVariants.all { v -> if (v.buildType.name == "release") { - def hashtag = new ByteArrayOutputStream() - exec { - commandLine "git", "rev-parse", "HEAD" - standardOutput = hashtag - } - hashtag = hashtag.toString().trim() - v.outputs[0].outputFileName = "reicast-android-" + hashtag.substring(0,7) + ".apk" - file('src/main/assets/build').text = hashtag + def hashtag = getVersionName() + def start = hashtag.lastIndexOf("-") + hashtag = hashtag.substring(start + 2, start + 9) + v.outputs[0].outputFileName = "reicast-android-" + hashtag + ".apk" } } } diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java index 5793f618a..c59f0ecdd 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java @@ -9,7 +9,6 @@ import android.support.constraint.ConstraintLayout; import android.support.design.widget.Snackbar; import android.support.graphics.drawable.VectorDrawableCompat; import android.support.v4.app.Fragment; -import android.text.util.Linkify; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -38,8 +37,6 @@ import javax.net.ssl.HttpsURLConnection; public class AboutFragment extends Fragment { String buildId = ""; - private ListView list; - private GitAdapter adapter; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -51,40 +48,21 @@ public class AboutFragment extends Fragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { - try { - InputStream file = getResources().getAssets().open("build"); - if (file != null) { - BufferedReader reader = new BufferedReader(new InputStreamReader(file)); - buildId = reader.readLine(); - file.close(); - } - } catch (IOException ioe) { - ioe.printStackTrace(); - } - try { String versionName = getActivity().getPackageManager() .getPackageInfo(getActivity().getPackageName(), 0).versionName; int versionCode = getActivity().getPackageManager() .getPackageInfo(getActivity().getPackageName(), 0).versionCode; TextView version = (TextView) getView().findViewById(R.id.revision_text); - String revision = getString(R.string.revision_text, - versionName, String.valueOf(versionCode)); - if (!buildId.equals("")) { - revision = getActivity().getString(R.string.revision_text, - versionName, buildId.substring(0,7)); - } - version.setText(revision); + version.setText(getString(R.string.revision_text, + versionName, String.valueOf(versionCode))); + int start = versionName.lastIndexOf("-"); + buildId = versionName.substring(start + 2, start + 9); } catch (NameNotFoundException e) { e.printStackTrace(); } - TextView website = (TextView) getView().findViewById( - R.id.site_text); - Linkify.addLinks(website, Linkify.ALL); - new retrieveGitTask().execute(Config.git_api); - } private class retrieveGitTask extends diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java index 9103839ab..97e618f8d 100644 --- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java +++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java @@ -86,7 +86,7 @@ public class GitAdapter extends BaseAdapter { final String current = commit.get("Build"); RelativeLayout item = (RelativeLayout) vi.findViewById(R.id.change); - if (current != null && !current.equals("") && current.equals(sha)) { + if (current != null && current.equals(sha.substring(0, 7))) { item.getBackground().setColorFilter(0xFF00FF00, PorterDuff.Mode.MULTIPLY); } else { @@ -96,8 +96,7 @@ public class GitAdapter extends BaseAdapter { dateText.setText(date); committerText.setText(committer); titleText.setText(title); - ImageLoader.getInstance() - .displayImage(avatar, avatarIcon, this.options); + ImageLoader.getInstance().displayImage(avatar, avatarIcon, this.options); vi.setOnClickListener(new OnClickListener() { public void onClick(View v) { diff --git a/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml index 2b029c765..159643ec2 100644 --- a/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml +++ b/shell/android-studio/reicast/src/main/res/layout/about_fragment.xml @@ -24,17 +24,6 @@ android:ems="12" android:gravity="center" android:text="@string/revision_text" /> - - - - - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/shell/android-studio/reicast/src/main/res/menu/activity_main.xml b/shell/android-studio/reicast/src/main/res/menu/activity_main.xml index ba01bf5c8..163518949 100644 --- a/shell/android-studio/reicast/src/main/res/menu/activity_main.xml +++ b/shell/android-studio/reicast/src/main/res/menu/activity_main.xml @@ -7,15 +7,12 @@ - - + @@ -25,5 +22,8 @@ +