ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Remove redundancy, Eliminate hash file

This commit is contained in:
Ender's Games 2018-08-20 23:27:29 -04:00
parent 7ff9d0ec02
commit e755446c5f
6 changed files with 48 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/android-studio/reicast/build.gradle
View File

@ -67,14 +67,10 @@ android {
afterEvaluate { afterEvaluate {
android.applicationVariants.all { v -> android.applicationVariants.all { v ->
if (v.buildType.name == "release") { if (v.buildType.name == "release") {
def hashtag = new ByteArrayOutputStream() def hashtag = getVersionName()
exec { def start = hashtag.lastIndexOf("-")
commandLine "git", "rev-parse", "HEAD" hashtag = hashtag.substring(start + 2, start + 9)
standardOutput = hashtag v.outputs[0].outputFileName = "reicast-android-" + hashtag + ".apk"
}
hashtag = hashtag.toString().trim()
v.outputs[0].outputFileName = "reicast-android-" + hashtag.substring(0,7) + ".apk"
file('src/main/assets/build').text = hashtag
} }
} }
} }

30
shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java
View File

@ -9,7 +9,6 @@ import android.support.constraint.ConstraintLayout;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.graphics.drawable.VectorDrawableCompat; import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.text.util.Linkify;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -38,8 +37,6 @@ import javax.net.ssl.HttpsURLConnection;
public class AboutFragment extends Fragment { public class AboutFragment extends Fragment {
String buildId = ""; String buildId = "";
private ListView list;
private GitAdapter adapter;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -51,40 +48,21 @@ public class AboutFragment extends Fragment {
@Override @Override
public void onViewCreated(View view, Bundle savedInstanceState) { 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 { try {
String versionName = getActivity().getPackageManager() String versionName = getActivity().getPackageManager()
.getPackageInfo(getActivity().getPackageName(), 0).versionName; .getPackageInfo(getActivity().getPackageName(), 0).versionName;
int versionCode = getActivity().getPackageManager() int versionCode = getActivity().getPackageManager()
.getPackageInfo(getActivity().getPackageName(), 0).versionCode; .getPackageInfo(getActivity().getPackageName(), 0).versionCode;
TextView version = (TextView) getView().findViewById(R.id.revision_text); TextView version = (TextView) getView().findViewById(R.id.revision_text);
String revision = getString(R.string.revision_text, version.setText(getString(R.string.revision_text,
versionName, String.valueOf(versionCode)); versionName, String.valueOf(versionCode)));
if (!buildId.equals("")) { int start = versionName.lastIndexOf("-");
revision = getActivity().getString(R.string.revision_text, buildId = versionName.substring(start + 2, start + 9);
versionName, buildId.substring(0,7));
}
version.setText(revision);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
TextView website = (TextView) getView().findViewById(
R.id.site_text);
Linkify.addLinks(website, Linkify.ALL);
new retrieveGitTask().execute(Config.git_api); new retrieveGitTask().execute(Config.git_api);
} }
private class retrieveGitTask extends private class retrieveGitTask extends

5
shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java
View File

@ -86,7 +86,7 @@ public class GitAdapter extends BaseAdapter {
final String current = commit.get("Build"); final String current = commit.get("Build");
RelativeLayout item = (RelativeLayout) vi.findViewById(R.id.change); 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, item.getBackground().setColorFilter(0xFF00FF00,
PorterDuff.Mode.MULTIPLY); PorterDuff.Mode.MULTIPLY);
} else { } else {
@ -96,8 +96,7 @@ public class GitAdapter extends BaseAdapter {
dateText.setText(date); dateText.setText(date);
committerText.setText(committer); committerText.setText(committer);
titleText.setText(title); titleText.setText(title);
ImageLoader.getInstance() ImageLoader.getInstance().displayImage(avatar, avatarIcon, this.options);
.displayImage(avatar, avatarIcon, this.options);
vi.setOnClickListener(new OnClickListener() { vi.setOnClickListener(new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {

11
shell/android-studio/reicast/src/main/res/layout/about_fragment.xml
View File

@ -25,17 +25,6 @@
android:gravity="center" android:gravity="center"
android:text="@string/revision_text" /> android:text="@string/revision_text" />
<TextView
android:id="@+id/site_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginTop="10dp"
android:ems="12"
android:gravity="center"
android:text="@string/app_site"
android:autoLink="web"/>
<LinearLayout <LinearLayout
android:id="@+id/changelist" android:id="@+id/changelist"
android:layout_width="match_parent" android:layout_width="match_parent"

67
shell/android-studio/reicast/src/main/res/menu-v23/activity_main.xml
View File

@ -2,40 +2,37 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view"> tools:showIn="navigation_view">
<item
<group android:checkableBehavior="single"> android:id="@+id/browser_menu"
<item android:icon="@drawable/ic_subdirectory_arrow_right"
android:id="@+id/browser_menu" android:title="@string/browser" />
android:icon="@drawable/ic_subdirectory_arrow_right" <item
android:title="@string/browser" /> android:id="@+id/settings_menu"
<item android:icon="@drawable/ic_settings"
android:id="@+id/settings_menu" android:title="@string/settings" />
android:icon="@drawable/ic_settings" <item
android:title="@string/settings" /> android:id="@+id/input_menu"
<item android:icon="@drawable/ic_input"
android:id="@+id/pgconfig_menu" android:title="@string/input" />
android:icon="@drawable/ic_settings" <item
android:title="@string/pgconfig" /> android:id="@+id/pgconfig_menu"
<item android:icon="@drawable/ic_settings"
android:id="@+id/input_menu" android:title="@string/pgconfig" />
android:icon="@drawable/ic_input" <item
android:title="@string/input" /> android:id="@+id/cloud_menu"
<item android:icon="@drawable/ic_cloud_queue"
android:id="@+id/about_menu" android:title="@string/cloud" />
android:icon="@drawable/ic_info_outline" <item
android:title="@string/about" /> android:id="@+id/rateme_menu"
<item android:icon="@drawable/ic_rate_review"
android:id="@+id/rateme_menu" android:title="@string/rateme" />
android:icon="@drawable/ic_rate_review" <item
android:title="@string/rateme" /> android:id="@+id/message_menu"
<item android:icon="@drawable/ic_send"
android:id="@+id/cloud_menu" android:title="@string/messages" />
android:icon="@drawable/ic_cloud_queue" <item
android:title="@string/cloud" /> android:id="@+id/about_menu"
<item android:icon="@drawable/ic_info_outline"
android:id="@+id/message_menu" android:title="@string/about" />
android:icon="@drawable/ic_send"
android:title="@string/messages" />
</group>
</menu> </menu>

12
shell/android-studio/reicast/src/main/res/menu/activity_main.xml
View File

@ -7,15 +7,12 @@
<item android:title="@string/settings" <item android:title="@string/settings"
android:id="@+id/settings_menu" android:id="@+id/settings_menu"
android:icon="@mipmap/menu_config" /> android:icon="@mipmap/menu_config" />
<item android:title="@string/pgconfig"
android:id="@+id/pgconfig_menu"
android:icon="@mipmap/menu_config" />
<item android:title="@string/input" <item android:title="@string/input"
android:id="@+id/input_menu" android:id="@+id/input_menu"
android:icon="@mipmap/menu_input" /> android:icon="@mipmap/menu_input" />
<item android:title="@string/about" <item android:title="@string/pgconfig"
android:id="@+id/about_menu" android:id="@+id/pgconfig_menu"
android:icon="@mipmap/menu_question" /> android:icon="@mipmap/menu_config" />
<item android:title="@string/cloud" <item android:title="@string/cloud"
android:id="@+id/cloud_menu" android:id="@+id/cloud_menu"
android:icon="@mipmap/menu_cloud" /> android:icon="@mipmap/menu_cloud" />
@ -25,5 +22,8 @@
<item android:title="@string/messages" <item android:title="@string/messages"
android:id="@+id/message_menu" android:id="@+id/message_menu"
android:icon="@mipmap/menu_debug" /> android:icon="@mipmap/menu_debug" />
<item android:title="@string/about"
android:id="@+id/about_menu"
android:icon="@mipmap/menu_question" />
</menu> </menu>