Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1306 from reicast/lk/menu_layout
Browse files Browse the repository at this point in the history 
Android: Remove redundancy, Eliminate hash file
  • Loading branch information
@AbandonedCart
AbandonedCart committed Aug 21, 2018
2 parents 7ff9d0e + e755446 commit 83c069e
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 89 deletions.
12 changes: 4 additions & 8 deletions shell/android-studio/reicast/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
30 changes: 4 additions & 26 deletions shell/android-studio/reicast/src/main/java/com/reicast/emulator/AboutFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
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;
Expand Down Expand Up @@ -38,8 +37,6 @@
public class AboutFragment extends Fragment {

String buildId = "";
private ListView list;
private GitAdapter adapter;

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Expand All @@ -51,40 +48,21 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@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
Expand Down
5 changes: 2 additions & 3 deletions shell/android-studio/reicast/src/main/java/com/reicast/emulator/debug/GitAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
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 {
Expand All @@ -96,8 +96,7 @@ public View getView(final int position, View convertView, ViewGroup parent) {
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) {
Expand Down
11 changes: 0 additions & 11 deletions shell/android-studio/reicast/src/main/res/layout/about_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,6 @@
android:ems="12"
android:gravity="center"
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
android:id="@+id/changelist"
Expand Down
67 changes: 32 additions & 35 deletions shell/android-studio/reicast/src/main/res/menu-v23/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,37 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view">

<group android:checkableBehavior="single">
<item
android:id="@+id/browser_menu"
android:icon="@drawable/ic_subdirectory_arrow_right"
android:title="@string/browser" />
<item
android:id="@+id/settings_menu"
android:icon="@drawable/ic_settings"
android:title="@string/settings" />
<item
android:id="@+id/pgconfig_menu"
android:icon="@drawable/ic_settings"
android:title="@string/pgconfig" />
<item
android:id="@+id/input_menu"
android:icon="@drawable/ic_input"
android:title="@string/input" />
<item
android:id="@+id/about_menu"
android:icon="@drawable/ic_info_outline"
android:title="@string/about" />
<item
android:id="@+id/rateme_menu"
android:icon="@drawable/ic_rate_review"
android:title="@string/rateme" />
<item
android:id="@+id/cloud_menu"
android:icon="@drawable/ic_cloud_queue"
android:title="@string/cloud" />
<item
android:id="@+id/message_menu"
android:icon="@drawable/ic_send"
android:title="@string/messages" />
</group>
<item
android:id="@+id/browser_menu"
android:icon="@drawable/ic_subdirectory_arrow_right"
android:title="@string/browser" />
<item
android:id="@+id/settings_menu"
android:icon="@drawable/ic_settings"
android:title="@string/settings" />
<item
android:id="@+id/input_menu"
android:icon="@drawable/ic_input"
android:title="@string/input" />
<item
android:id="@+id/pgconfig_menu"
android:icon="@drawable/ic_settings"
android:title="@string/pgconfig" />
<item
android:id="@+id/cloud_menu"
android:icon="@drawable/ic_cloud_queue"
android:title="@string/cloud" />
<item
android:id="@+id/rateme_menu"
android:icon="@drawable/ic_rate_review"
android:title="@string/rateme" />
<item
android:id="@+id/message_menu"
android:icon="@drawable/ic_send"
android:title="@string/messages" />
<item
android:id="@+id/about_menu"
android:icon="@drawable/ic_info_outline"
android:title="@string/about" />

</menu>
12 changes: 6 additions & 6 deletions shell/android-studio/reicast/src/main/res/menu/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@
<item android:title="@string/settings"
android:id="@+id/settings_menu"
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"
android:id="@+id/input_menu"
android:icon="@mipmap/menu_input" />
<item android:title="@string/about"
android:id="@+id/about_menu"
android:icon="@mipmap/menu_question" />
<item android:title="@string/pgconfig"
android:id="@+id/pgconfig_menu"
android:icon="@mipmap/menu_config" />
<item android:title="@string/cloud"
android:id="@+id/cloud_menu"
android:icon="@mipmap/menu_cloud" />
Expand All @@ -25,5 +22,8 @@
<item android:title="@string/messages"
android:id="@+id/message_menu"
android:icon="@mipmap/menu_debug" />
<item android:title="@string/about"
android:id="@+id/about_menu"
android:icon="@mipmap/menu_question" />

</menu>

0 comments on commit 83c069e

Please sign in to comment.