Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android: add initial android app #4324

Merged
merged 5 commits into from Nov 17, 2018

Conversation

Projects
None yet
6 participants
@BreadFish64
Copy link
Contributor

BreadFish64 commented Oct 9, 2018

adds the proper build files, resources and the bare minimum of actual code to create an android app.
This app runs at 1440p 60fps with no graphical issues:
image


This change is Reviewable

@BreadFish64 BreadFish64 force-pushed the BreadFish64:android1 branch from 9c9a843 to 279bf75 Oct 9, 2018

@haishen666

This comment was marked as off-topic.

Copy link

haishen666 commented Oct 10, 2018

When will the Android 3DS simulator complete?

@citra-emu citra-emu locked as too heated and limited conversation to collaborators Oct 10, 2018

@zhaowenlan1779
Copy link
Member

zhaowenlan1779 left a comment

  1. I think all java files should get a copyright notice
  2. For a initial app, I don't think we need to get all those icons. Some of them may not be used for a long time (e.g. quicksave/quickload). IMO we can add them back when we really use them
  3. I could not test the compilation for now, but I guess it would be good

//Uncomment disable lines for test builds...
//disable 'MissingTranslation'
//disable 'ExtraTranslation'

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

is this needed?
Even if it is, please add a space after the //


externalNativeBuild {
cmake {
//version getCmakeVersion()

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

either uncomment or remove this

// Allows FRP-style asynchronous operations in Android.
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'com.nononsenseapps:filepicker:4.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

are these dependencies needed?

This comment has been minimized.

Copy link
@BreadFish64

BreadFish64 Oct 11, 2018

Author Contributor

these were leftover from dolphin's stuff, I can probably remove them for now and add them back if we need them later


import android.app.Application;

public class CitraApplication extends Application {}

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

an empty derived Application class does not make sense

This comment has been minimized.

Copy link
@BreadFish64

BreadFish64 Oct 11, 2018

Author Contributor

It will later when we add the game list.

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 13, 2018

Member

Then why not add this back when you need it?

This comment has been minimized.

Copy link
@BreadFish64

BreadFish64 Oct 17, 2018

Author Contributor

because it's the name in the manifest

<resources>

<color name="dolphin_blue">#2196f3</color>
<color name="dolphin_blue_dark">#1976d2</color>

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

Please remove these dolphin colors


<color name="tv_card_unselected">#444444</color>

</resources>

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

missing newline


<!-- If you want to set a specific toolbar theme, do it here -->

<item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

This is not properly indented

<item name="colorPrimaryDark">@color/citra_orange_dark</item>
<item name="colorAccent">@color/citra_orange_dark</item>

<!--&lt;!&ndash; Setting a divider is entirely optional &ndash;&gt;-->

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

what's with this line?

This comment has been minimized.

Copy link
@BreadFish64

BreadFish64 Oct 11, 2018

Author Contributor

I assume the weird gibberish is parsed by an IDE

public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

missing newline

@@ -0,0 +1,240 @@
<code_scheme name="Dolphin-Java" version="173">

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 11, 2018

Member

Citra-Java.
Also, I'm not sure if we should just copy dolphin's file as our code style is not really the same as theirs.

This comment has been minimized.

Copy link
@BreadFish64

BreadFish64 Oct 11, 2018

Author Contributor

Do we just want to make the Java code style match the C++ style as closely as possible?
(last I checked, our formatting isn't too different)

@citra-emu citra-emu unlocked this conversation Oct 11, 2018

@chris062689

This comment has been minimized.

Copy link
Member

chris062689 commented Oct 11, 2018

I am currently working in a fork that builds the APK on Bitrise.

android:name="android.hardware.gamepad"
android:required="false"/>

<uses-feature android:glEsVersion="0x00030000" />

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 13, 2018

Member

Don't we want GL ES 3.2?

This comment has been minimized.

Copy link
@jroweboy

jroweboy Oct 17, 2018

Member

3.1 with the https://developer.android.com/guide/topics/graphics/opengl#aep android extension pack should be considered good enough


import android.app.Application;

public class CitraApplication extends Application {}

This comment has been minimized.

Copy link
@zhaowenlan1779

zhaowenlan1779 Oct 13, 2018

Member

Then why not add this back when you need it?

@BreadFish64 BreadFish64 force-pushed the BreadFish64:android1 branch from d18afc9 to 18771f1 Nov 14, 2018

add initial bitrise CI support for android
Co-Authored-By: Flame Sage <chris062689@users.noreply.github.com>

@BreadFish64 BreadFish64 force-pushed the BreadFish64:android1 branch from 5730a74 to aada00c Nov 17, 2018

@wwylele wwylele merged commit 4d1c4f8 into citra-emu:master Nov 17, 2018

1 of 4 checks passed

code-review/reviewable 31 files, 11 discussions left (zhaowenlan1779)
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
ci/bitrise/4ccd8e5720f0d13b/pr Passed - citra
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.