Skip to content

Commit

Permalink
pre-commit run --all-files
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikaela committed Oct 16, 2023
1 parent 75404e5 commit 8a02949
Show file tree
Hide file tree
Showing 122 changed files with 106 additions and 162 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/versions.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FLUTTER_VERSION=3.13.7
JAVA_VERSION=17
JAVA_VERSION=17
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ This release fixes a bug which makes it impossible to send images in unencrypted
- fix: Open matrix.to urls
- fix: Padding and colors
- fix: Sharing invite link
- fix: Unread bubbles on iOS
- fix: Unread bubbles on iOS
- fix: Sending images in unencrypted rooms

## v0.38.0 - 2021-08-22
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ RUN flutter build web --release --source-maps

FROM docker.io/nginx:alpine
RUN rm -rf /usr/share/nginx/html
COPY --from=builder /app/build/web /usr/share/nginx/html
COPY --from=builder /app/build/web /usr/share/nginx/html
2 changes: 1 addition & 1 deletion android/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
}
],
"configuration_version": "1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<item>
<bitmap android:gravity="center" android:src="@drawable/splash"/>
</item>
</layer-list>
</layer-list>
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<item>
<bitmap android:gravity="center" android:src="@drawable/splash"/>
</item>
</layer-list>
</layer-list>
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<item>
<bitmap android:gravity="center" android:src="@drawable/splash"/>
</item>
</layer-list>
</layer-list>
2 changes: 1 addition & 1 deletion android/app/src/main/res/drawable/launch_background.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
<item>
<bitmap android:gravity="center" android:src="@drawable/splash"/>
</item>
</layer-list>
</layer-list>
2 changes: 1 addition & 1 deletion android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>
</adaptive-icon>
4 changes: 2 additions & 2 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>
</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ the space hierarchy and session dump have been implemented.
- chore: Remove permission handler dependency and increase compileSdkVersion (Christian Pauly)
- chore: Switch to flutter 3.0.5 (Krille Fear)
- chore: Update SDK (Christian Pauly)
- chore: remove snapping sheet (TheOneWithTheBraid)
- chore: remove snapping sheet (TheOneWithTheBraid)
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Nonprofit
FluffyChat is donation funded.

Cute ♥
Cute design and many theme settings including a dark mode.
Cute design and many theme settings including a dark mode.

One-to-one and groupchats
Unlimited groups and direct chats.
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Chat with your friends with FluffyChat.
Chat with your friends with FluffyChat.
2 changes: 1 addition & 1 deletion android/fastlane/metadata/android/en-US/title.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FluffyChat
FluffyChat
24 changes: 12 additions & 12 deletions android/fastlane/report.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
<testsuite name="fastlane.lanes">




<testcase classname="fastlane.lanes" name="0: update_fastlane" time="1.455419">

</testcase>


<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000127">

</testcase>


<testcase classname="fastlane.lanes" name="2: google_play_track_version_codes" time="2.638619">

</testcase>

</testsuite>
</testsuites>
2 changes: 1 addition & 1 deletion appimage/AppRun
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh

cd "$(dirname "$0")"
exec ./fluffychat
exec ./fluffychat
2 changes: 1 addition & 1 deletion appimage/FluffyChat.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Comment=Matrix Client. Chat with your friends
Exec=AppRun
Icon=fluffychat
Terminal=false
Categories=Network;Chat;InstantMessaging;X-Matrix;
Categories=Network;Chat;InstantMessaging;X-Matrix;
2 changes: 1 addition & 1 deletion assets/l10n/intl_bn.arb
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_bo.arb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{}
2 changes: 1 addition & 1 deletion assets/l10n/intl_ca.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2013,4 +2013,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_eo.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2033,4 +2033,4 @@
"@homeserver": {},
"sendOnEnter": "Sendi per eniga klavo",
"@sendOnEnter": {}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_ga.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2098,4 +2098,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_he.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1409,4 +1409,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_hi.arb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{}
2 changes: 1 addition & 1 deletion assets/l10n/intl_hu.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2003,4 +2003,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_ie.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1210,4 +1210,4 @@
"min": {}
}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_it.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1967,4 +1967,4 @@
},
"yourChatBackupHasBeenSetUp": "Il tuo backup delle chat è stato configurato.",
"@yourChatBackupHasBeenSetUp": {}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_ko.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2233,4 +2233,4 @@
"@dehydrate": {},
"dehydrateWarning": "이 동작은 되돌릴 수 없습니다. 백업 파일을 꼭 안전하게 보관하세요.",
"@dehydrateWarning": {}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_lt.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2405,4 +2405,4 @@
},
"hideUnimportantStateEvents": "Slėpti nesvarbius būsenos įvykius",
"@hideUnimportantStateEvents": {}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_nb.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1780,4 +1780,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_pt.arb
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@
"day": {}
}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_pt_PT.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1685,4 +1685,4 @@
"@hydrateTor": {},
"dehydrateTorLong": "Para utilizadores do TOR, é recomendado exportar a sessão antes de fechar a janela.",
"@dehydrateTorLong": {}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_sl.arb
Original file line number Diff line number Diff line change
Expand Up @@ -603,4 +603,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_sr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1930,4 +1930,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_sv.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2486,4 +2486,4 @@
"path": {}
}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_ta.arb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_th.arb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{}
{}
2 changes: 1 addition & 1 deletion assets/l10n/intl_vi.arb
Original file line number Diff line number Diff line change
Expand Up @@ -449,4 +449,4 @@
"type": "text",
"placeholders": {}
}
}
}
2 changes: 1 addition & 1 deletion assets/l10n/intl_zh_Hant.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1916,4 +1916,4 @@
"@chatHasBeenAddedToThisSpace": {},
"clearArchive": "清除存檔",
"@clearArchive": {}
}
}
2 changes: 1 addition & 1 deletion assets/sas-emoji.json
Original file line number Diff line number Diff line change
Expand Up @@ -2175,4 +2175,4 @@
"zh_Hans": "图钉"
}
}
]
]
2 changes: 1 addition & 1 deletion config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
"render_html": false,
"hide_redacted_events": false,
"hide_unknown_events": false
}
}
2 changes: 1 addition & 1 deletion docs/OFL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ <h1 class="flex text-4xl items-center mb-4">

</body>

</html>
</html>
1 change: 0 additions & 1 deletion docs/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ module.exports = {
},
plugins: [],
}

2 changes: 1 addition & 1 deletion fdroid/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
repo
srclibs
tmp
chat.fluffy.fluffychat
chat.fluffy.fluffychat
2 changes: 1 addition & 1 deletion fdroid/metadata/chat.fluffy.fluffychat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Description: |
FluffyChat is donation funded.
Cute ♥
Cute design and many theme settings including a dark mode.
Cute design and many theme settings including a dark mode.
One-to-one and groupchats
Unlimited groups and direct chats.
Expand Down
2 changes: 1 addition & 1 deletion integration_test/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ dendrite/data/server.*
dendrite/data/matrix_key.pem
dendrite/data/logs
dendrite/data/jetstream
dendrite/data/*.db
dendrite/data/*.db
5 changes: 2 additions & 3 deletions integration_test/dendrite/data/dendrite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ federation_api:
media_api:
database:
connection_string: file:media_api.db

# Storage path for uploaded media. May be relative or absolute.
base_path: ./media_store

Expand Down Expand Up @@ -277,7 +277,7 @@ key_server:
room_server:
database:
connection_string: file:room_server.db


# Configuration for the User API.
user_api:
Expand Down Expand Up @@ -324,4 +324,3 @@ logging:
level: info
params:
path: ./logs

2 changes: 1 addition & 1 deletion integration_test/synapse/data/localhost.log.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ root:
handlers: [console]


disable_existing_loggers: false
disable_existing_loggers: false
2 changes: 1 addition & 1 deletion ios/FluffyChat Share/ShareViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -332,4 +332,4 @@ extension Array {
subscript (safe index: UInt) -> Element? {
return Int(index) < count ? self[Int(index)] : nil
}
}
}
Loading

0 comments on commit 8a02949

Please sign in to comment.