android: Run final format

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

View File

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

View File

@ -174,7 +174,7 @@ public final class GameDatabase extends SQLiteOpenHelper {
} }
private static void addGamesRecursive(SQLiteDatabase database, File parent, Set<String> allowedExtensions, int depth) { private static void addGamesRecursive(SQLiteDatabase database, File parent, Set<String> allowedExtensions, int depth) {
if(depth <= 0) { if (depth <= 0) {
return; return;
} }
@ -189,8 +189,7 @@ public final class GameDatabase extends SQLiteOpenHelper {
Set<String> newExtensions = new HashSet<>(Arrays.asList( Set<String> newExtensions = new HashSet<>(Arrays.asList(
".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app")); ".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app"));
addGamesRecursive(database, file, newExtensions, depth - 1); addGamesRecursive(database, file, newExtensions, depth - 1);
} } else {
else {
String filePath = file.getPath(); String filePath = file.getPath();
int extensionStart = filePath.lastIndexOf('.'); int extensionStart = filePath.lastIndexOf('.');

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,4 +2,4 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/frame_content"/> android:id="@+id/frame_content" />

View File

@ -14,7 +14,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/text_value" android:layout_below="@+id/text_value"
android:layout_marginBottom="@dimen/spacing_medlarge"/> android:layout_marginBottom="@dimen/spacing_medlarge" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -24,7 +24,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/spacing_medlarge" android:layout_marginTop="@dimen/spacing_medlarge"
android:layout_marginBottom="@dimen/spacing_medlarge"/> android:layout_marginBottom="@dimen/spacing_medlarge" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -32,6 +32,6 @@
tools:text="%" tools:text="%"
android:id="@+id/text_units" android:id="@+id/text_units"
android:layout_alignTop="@+id/text_value" android:layout_alignTop="@+id/text_value"
android:layout_toEndOf="@+id/text_value"/> android:layout_toEndOf="@+id/text_value" />
</RelativeLayout> </RelativeLayout>

View File

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

View File

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

View File

@ -20,7 +20,7 @@
android:text="@string/empty_gamelist" android:text="@string/empty_gamelist"
android:visibility="gone" android:visibility="gone"
android:textSize="18sp" android:textSize="18sp"
android:gravity="center"/> android:gravity="center" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/grid_games" android:id="@+id/grid_games"

View File

@ -21,7 +21,7 @@
android:layout_toStartOf="@+id/checkbox" android:layout_toStartOf="@+id/checkbox"
android:textColor="@color/header_text" android:textColor="@color/header_text"
android:textSize="16sp" android:textSize="16sp"
tools:text="@string/frame_limit_enable"/> tools:text="@string/frame_limit_enable" />
<TextView <TextView
android:id="@+id/text_setting_description" android:id="@+id/text_setting_description"
@ -47,6 +47,6 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
android:focusable="false" android:focusable="false"
android:clickable="false"/> android:clickable="false" />
</RelativeLayout> </RelativeLayout>

View File

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

View File

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

View File

@ -9,19 +9,19 @@
<menu> <menu>
<item <item
android:id="@+id/menu_emulation_edit_layout" android:id="@+id/menu_emulation_edit_layout"
android:title="@string/emulation_edit_layout"/> android:title="@string/emulation_edit_layout" />
<item <item
android:id="@+id/menu_emulation_toggle_controls" android:id="@+id/menu_emulation_toggle_controls"
android:title="@string/emulation_toggle_controls"/> android:title="@string/emulation_toggle_controls" />
<item <item
android:id="@+id/menu_emulation_adjust_scale" android:id="@+id/menu_emulation_adjust_scale"
android:title="@string/emulation_control_scale"/> android:title="@string/emulation_control_scale" />
<item <item
android:id="@+id/menu_emulation_reset_overlay" android:id="@+id/menu_emulation_reset_overlay"
android:title="@string/emulation_touch_overlay_reset"/> android:title="@string/emulation_touch_overlay_reset" />
</menu> </menu>
</item> </item>
@ -31,11 +31,11 @@
<menu> <menu>
<item <item
android:id="@+id/menu_emulation_amiibo_load" android:id="@+id/menu_emulation_amiibo_load"
android:title="@string/menu_emulation_amiibo_load"/> android:title="@string/menu_emulation_amiibo_load" />
<item <item
android:id="@+id/menu_emulation_amiibo_remove" android:id="@+id/menu_emulation_amiibo_remove"
android:title="@string/menu_emulation_amiibo_remove"/> android:title="@string/menu_emulation_amiibo_remove" />
</menu> </menu>
</item> </item>
@ -47,19 +47,19 @@
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item <item
android:id="@+id/menu_screen_layout_landscape" android:id="@+id/menu_screen_layout_landscape"
android:title="@string/emulation_screen_layout_landscape"/> android:title="@string/emulation_screen_layout_landscape" />
<item <item
android:id="@+id/menu_screen_layout_portrait" android:id="@+id/menu_screen_layout_portrait"
android:title="@string/emulation_screen_layout_portrait"/> android:title="@string/emulation_screen_layout_portrait" />
<item <item
android:id="@+id/menu_screen_layout_single" android:id="@+id/menu_screen_layout_single"
android:title="@string/emulation_screen_layout_single"/> android:title="@string/emulation_screen_layout_single" />
<item <item
android:id="@+id/menu_screen_layout_sidebyside" android:id="@+id/menu_screen_layout_sidebyside"
android:title="@string/emulation_screen_layout_sidebyside"/> android:title="@string/emulation_screen_layout_sidebyside" />
</group> </group>
</menu> </menu>
</item> </item>
@ -68,23 +68,23 @@
android:id="@+id/menu_emulation_swap_screens" android:id="@+id/menu_emulation_swap_screens"
app:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_swap_screens" android:title="@string/emulation_swap_screens"
android:checkable="true"/> android:checkable="true" />
<item <item
android:id="@+id/menu_emulation_show_fps" android:id="@+id/menu_emulation_show_fps"
app:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_show_fps" android:title="@string/emulation_show_fps"
android:checkable="true"/> android:checkable="true" />
<item <item
android:id="@+id/menu_emulation_show_overlay" android:id="@+id/menu_emulation_show_overlay"
app:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_show_overlay" android:title="@string/emulation_show_overlay"
android:checkable="true"/> android:checkable="true" />
<item <item
android:id="@+id/menu_emulation_open_settings" android:id="@+id/menu_emulation_open_settings"
app:showAsAction="never" app:showAsAction="never"
android:title="@string/emulation_open_settings"/> android:title="@string/emulation_open_settings" />
</menu> </menu>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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