Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: Run final format

Browse Source
This commit is contained in:
FearlessTobi 2020-05-02 21:34:27 +02:00 committed by bunnei
parent baa12c851b
commit 0cc0e9e746
25 changed files with 95 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java
View File

@ -96,7 +96,7 @@ public class CustomFilePickerFragment extends FilePickerFragment {
@Override
public void goUp() {
if(Environment.getExternalStorageDirectory().getPath().equals(mCurrentPath.getPath())) {
if (Environment.getExternalStorageDirectory().getPath().equals(mCurrentPath.getPath())) {
return;
}
super.goUp();

17
src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java
View File

@ -168,13 +168,13 @@ public final class GameDatabase extends SQLiteOpenHelper {
folderCursor.close();
Arrays.stream(NativeLibrary.GetInstalledGamePaths())
.forEach(filePath -> attemptToAddGame(database, filePath));
.forEach(filePath -> attemptToAddGame(database, filePath));
database.close();
}
private static void addGamesRecursive(SQLiteDatabase database, File parent, Set<String> allowedExtensions, int depth) {
if(depth <= 0) {
if (depth <= 0) {
return;
}
@ -189,8 +189,7 @@ public final class GameDatabase extends SQLiteOpenHelper {
Set<String> newExtensions = new HashSet<>(Arrays.asList(
".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app"));
addGamesRecursive(database, file, newExtensions, depth - 1);
}
else {
} else {
String filePath = file.getPath();
int extensionStart = filePath.lastIndexOf('.');
@ -224,11 +223,11 @@ public final class GameDatabase extends SQLiteOpenHelper {
}
ContentValues game = Game.asContentValues(name,
NativeLibrary.GetDescription(filePath).replace("\n", " "),
NativeLibrary.GetRegions(filePath),
filePath,
gameId,
NativeLibrary.GetCompany(filePath));
NativeLibrary.GetDescription(filePath).replace("\n", " "),
NativeLibrary.GetRegions(filePath),
filePath,
gameId,
NativeLibrary.GetCompany(filePath));
// Try to update an existing game first.
int rowsMatched = database.update(TABLE_NAME_GAMES, // Which table to update.

5
src/android/app/src/main/jni/native.cpp
View File

@ -250,9 +250,8 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_GetInstalledGamePaths(
ScanDir(nullptr, "",
FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
"00000000000000000000000000000000/title/00040010");
jobjectArray jgames =
env->NewObjectArray(static_cast<jsize>(games.size()), env->FindClass("java/lang/String"),
nullptr);
jobjectArray jgames = env->NewObjectArray(static_cast<jsize>(games.size()),
env->FindClass("java/lang/String"), nullptr);
for (jsize i = 0; i < games.size(); ++i)
env->SetObjectArrayElement(jgames, i, env->NewStringUTF(games[i].c_str()));
return jgames;

6
src/android/app/src/main/res/animator/settings_enter.xml
View File

@ -7,7 +7,7 @@
android:propertyName="yFraction"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="1.0"
android:valueTo="0"/>
android:valueTo="0" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -15,7 +15,7 @@
android:propertyName="translationZ"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="100.0"
android:valueTo="0"/>
android:valueTo="0" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -23,6 +23,6 @@
android:propertyName="elevation"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="100.0"
android:valueTo="0"/>
android:valueTo="0" />
</set>

6
src/android/app/src/main/res/animator/settings_exit.xml
View File

@ -7,7 +7,7 @@
android:propertyName="visibleness"
android:valueFrom="1.0f"
android:valueTo="0.6f"
android:valueType="floatType"/>
android:valueType="floatType" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -15,7 +15,7 @@
android:propertyName="translationZ"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="0"
android:valueTo="-100.0"/>
android:valueTo="-100.0" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -23,6 +23,6 @@
android:propertyName="elevation"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="0"
android:valueTo="-100.0"/>
android:valueTo="-100.0" />
</set>

6
src/android/app/src/main/res/animator/settings_pop_enter.xml
View File

@ -7,7 +7,7 @@
android:propertyName="visibleness"
android:valueFrom="0.6f"
android:valueTo="1.0f"
android:valueType="floatType"/>
android:valueType="floatType" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -15,7 +15,7 @@
android:propertyName="translationZ"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="-100.0"
android:valueTo="0"/>
android:valueTo="0" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -23,6 +23,6 @@
android:propertyName="elevation"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="-100.0"
android:valueTo="0"/>
android:valueTo="0" />
</set>

6
src/android/app/src/main/res/animator/setttings_pop_exit.xml
View File

@ -6,7 +6,7 @@
android:interpolator="@android:interpolator/accelerate_cubic"
android:propertyName="yFraction"
android:valueFrom="0"
android:valueTo="1.0"/>
android:valueTo="1.0" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -14,7 +14,7 @@
android:propertyName="translationZ"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="0.0"
android:valueTo="100"/>
android:valueTo="100" />
<objectAnimator
android:duration="@android:integer/config_mediumAnimTime"
@ -22,6 +22,6 @@
android:propertyName="elevation"
android:startOffset="@android:integer/config_shortAnimTime"
android:valueFrom="0.0"
android:valueTo="100"/>
android:valueTo="100" />
</set>

6
src/android/app/src/main/res/layout/activity_settings.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/frame_content"/>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/frame_content" />

2
src/android/app/src/main/res/layout/card_game.xml
View File

@ -44,7 +44,7 @@
app:layout_constraintStart_toEndOf="@+id/image_game_screen"
app:layout_constraintTop_toTopOf="parent"
tools:text="The Legend of Zelda\nOcarina of Time 3D"
android:textColor="@color/header_text" />
android:textColor="@color/header_text" />
<TextView
android:id="@+id/text_company"

14
src/android/app/src/main/res/layout/dialog_seekbar.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<SeekBar
android:id="@+id/seekbar"
@ -14,7 +14,7 @@
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/text_value"
android:layout_marginBottom="@dimen/spacing_medlarge"/>
android:layout_marginBottom="@dimen/spacing_medlarge" />
<TextView
android:layout_width="wrap_content"
@ -24,7 +24,7 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/spacing_medlarge"
android:layout_marginBottom="@dimen/spacing_medlarge"/>
android:layout_marginBottom="@dimen/spacing_medlarge" />
<TextView
android:layout_width="wrap_content"
@ -32,6 +32,6 @@
tools:text="%"
android:id="@+id/text_units"
android:layout_alignTop="@+id/text_value"
android:layout_toEndOf="@+id/text_value"/>
android:layout_toEndOf="@+id/text_value" />
</RelativeLayout>

6
src/android/app/src/main/res/layout/filepicker_toolbar.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/nnf_picker_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -12,7 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:orientation="vertical">
<TextView
android:id="@+id/filepicker_title"
@ -21,6 +20,7 @@
android:ellipsize="start"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
<TextView
android:id="@+id/nnf_current_dir"
android:layout_width="match_parent"

4
src/android/app/src/main/res/layout/fragment_emulation.xml
View File

@ -19,7 +19,7 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:focusable="true"
android:focusableInTouchMode="true"/>
android:focusableInTouchMode="true" />
<TextView
android:id="@+id/show_fps_text"
@ -42,6 +42,6 @@
android:padding="@dimen/spacing_small"
android:background="@color/citra_orange"
android:text="@string/emulation_done"
android:visibility="gone"/>
android:visibility="gone" />
</FrameLayout>

8
src/android/app/src/main/res/layout/fragment_grid.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refresh_grid_games"
@ -20,7 +20,7 @@
android:text="@string/empty_gamelist"
android:visibility="gone"
android:textSize="18sp"
android:gravity="center"/>
android:gravity="center" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/grid_games"

20
src/android/app/src/main/res/layout/list_item_setting.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="72dp"
android:paddingTop="@dimen/spacing_large"
android:paddingBottom="@dimen/spacing_large">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="72dp"
android:paddingTop="@dimen/spacing_large"
android:paddingBottom="@dimen/spacing_large">
<TextView
android:id="@+id/text_setting_name"

18
src/android/app/src/main/res/layout/list_item_setting_checkbox.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="72dp"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="72dp"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true">
<TextView
android:id="@+id/text_setting_name"
@ -21,7 +21,7 @@
android:layout_toStartOf="@+id/checkbox"
android:textColor="@color/header_text"
android:textSize="16sp"
tools:text="@string/frame_limit_enable"/>
tools:text="@string/frame_limit_enable" />
<TextView
android:id="@+id/text_setting_description"
@ -47,6 +47,6 @@
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_large"
android:focusable="false"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>

6
src/android/app/src/main/res/layout/list_item_settings_header.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="48dp">
<TextView
android:id="@+id/text_header_name"

2
src/android/app/src/main/res/layout/premium_item_setting.xml
View File

@ -38,6 +38,6 @@
android:layout_marginEnd="@dimen/spacing_large"
android:visibility="visible"
tools:text="@string/app_disclaimer"
android:textColor="@color/header_subtext"/>
android:textColor="@color/header_subtext" />
</RelativeLayout>

11
src/android/app/src/main/res/layout/sysclock_datetime_picker.xml
View File

@ -1,23 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="8dp"
android:gravity="center"
>
android:gravity="center">
<DatePicker
android:id="@+id/date_picker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:calendarViewShown="false"
android:datePickerMode="spinner"
android:spinnersShown="true"/>
android:spinnersShown="true" />
<TimePicker
android:id="@+id/time_picker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:timePickerMode="spinner"/>
android:timePickerMode="spinner" />
</LinearLayout>

34
src/android/app/src/main/res/menu/menu_emulation.xml
View File

@ -1,7 +1,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="org.citra.citra_emu.activities.EmulationActivity">
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="org.citra.citra_emu.activities.EmulationActivity">
<item
android:id="@+id/menu_emulation_configure_controls"
@ -9,19 +9,19 @@
<menu>
<item
android:id="@+id/menu_emulation_edit_layout"
android:title="@string/emulation_edit_layout"/>
android:title="@string/emulation_edit_layout" />
<item
android:id="@+id/menu_emulation_toggle_controls"
android:title="@string/emulation_toggle_controls"/>
android:title="@string/emulation_toggle_controls" />
<item
android:id="@+id/menu_emulation_adjust_scale"
android:title="@string/emulation_control_scale"/>
android:title="@string/emulation_control_scale" />
<item
android:id="@+id/menu_emulation_reset_overlay"
android:title="@string/emulation_touch_overlay_reset"/>
android:title="@string/emulation_touch_overlay_reset" />
</menu>
</item>
@ -31,11 +31,11 @@
<menu>
<item
android:id="@+id/menu_emulation_amiibo_load"
android:title="@string/menu_emulation_amiibo_load"/>
android:title="@string/menu_emulation_amiibo_load" />
<item
android:id="@+id/menu_emulation_amiibo_remove"
android:title="@string/menu_emulation_amiibo_remove"/>
android:title="@string/menu_emulation_amiibo_remove" />
</menu>
</item>
@ -47,19 +47,19 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/menu_screen_layout_landscape"
android:title="@string/emulation_screen_layout_landscape"/>
android:title="@string/emulation_screen_layout_landscape" />
<item
android:id="@+id/menu_screen_layout_portrait"
android:title="@string/emulation_screen_layout_portrait"/>
android:title="@string/emulation_screen_layout_portrait" />
<item
android:id="@+id/menu_screen_layout_single"
android:title="@string/emulation_screen_layout_single"/>
android:title="@string/emulation_screen_layout_single" />
<item
android:id="@+id/menu_screen_layout_sidebyside"
android:title="@string/emulation_screen_layout_sidebyside"/>
android:title="@string/emulation_screen_layout_sidebyside" />
</group>
</menu>
</item>
@ -68,23 +68,23 @@
android:id="@+id/menu_emulation_swap_screens"
app:showAsAction="never"
android:title="@string/emulation_swap_screens"
android:checkable="true"/>
android:checkable="true" />
<item
android:id="@+id/menu_emulation_show_fps"
app:showAsAction="never"
android:title="@string/emulation_show_fps"
android:checkable="true"/>
android:checkable="true" />
<item
android:id="@+id/menu_emulation_show_overlay"
app:showAsAction="never"
android:title="@string/emulation_show_overlay"
android:checkable="true"/>
android:checkable="true" />
<item
android:id="@+id/menu_emulation_open_settings"
app:showAsAction="never"
android:title="@string/emulation_open_settings"/>
android:title="@string/emulation_open_settings" />
</menu>

4
src/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<background android:drawable="@color/ic_launcher_background" />
<foreground android:drawable="@mipmap/ic_launcher_foreground" />
</adaptive-icon>

2
src/android/app/src/main/res/values-fi/strings.xml
View File

@ -93,4 +93,4 @@
<string name="i_forgot">Unohdin</string>
<string name="fixed_length_required">Tekstin pituus ei ole oikein (pitäisi olla %d merkkiä) </string>
<string name="max_length_exceeded">Teksti on liian pitkä (ei pitäisi olla enempää kuin %d merkkiä)</string>
</resources>
</resources>

2
src/android/app/src/main/res/values-ja/strings.xml
View File

@ -111,4 +111,4 @@
<string name="blank_input_not_allowed">空白だけの入力はできません</string>
<string name="empty_input_not_allowed">入力なしのまま進めることはできません</string>
</resources>
</resources>

1
src/android/app/src/main/res/values-night/styles_filepicker.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="FilePickerBaseTheme" parent="NNF_BaseTheme" />
</resources>

2
src/android/app/src/main/res/values/arrays.xml
View File

@ -123,7 +123,7 @@
</string-array>
<string-array name="cameraDeviceValues">
<item/>
<item />
<item>_front</item>
<item>_back</item>
</string-array>

1
src/android/app/src/main/res/values/styles_filepicker.xml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="FilePickerBaseTheme" parent="NNF_BaseTheme.Light" />
</resources>