Skip to content

Commit

Permalink
pre-commit run --all-files && git add --renormalize .
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikaela committed Jul 16, 2023
1 parent 3e60710 commit aaa7c31
Show file tree
Hide file tree
Showing 133 changed files with 514 additions and 571 deletions.
1 change: 0 additions & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,3 @@ jobs:
run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y
- run: flutter pub get
- run: flutter build linux

2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ jobs:
upload_url: ${{ needs.create_release.outputs.upload_url }}
asset_path: release_description.txt
asset_name: release_description.txt
asset_content_type: text/plain
asset_content_type: text/plain
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.10.6
JAVA_VERSION=17
JAVA_VERSION=17
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ RUN ./scripts/build-web.sh

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 @@ -33,4 +33,4 @@ class FcmPushService : FcmSharedIsolateService() {
}
}
}
*/
*/
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ class UnifiedPushReceiver : UnifiedPushReceiver() {
}
return engine
}
}
}
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_cs.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2339,4 +2339,4 @@
"senderName": {}
}
}
}
}
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_fr.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2487,4 +2487,4 @@
"@jumpToLastReadMessage": {},
"readUpToHere": "Lisez jusqu’ici",
"@readUpToHere": {}
}
}
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_ja.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2387,4 +2387,4 @@
"@newSpace": {},
"reopenChat": "チャットを再開する",
"@reopenChat": {}
}
}
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_nl.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2490,4 +2490,4 @@
"@jump": {},
"openLinkInBrowser": "Link in browser openen",
"@openLinkInBrowser": {}
}
}
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_BR.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2442,4 +2442,4 @@
"@noEmailWarning": {},
"noKeyForThisMessage": "Isto pode ocorrer caso a mensagem tenha sido enviada antes da entrada na sua conta com este dispositivo.\n\nTambém é possível que o remetente tenha bloqueado o seu dispositivo ou ocorreu algum problema com a conexão.\n\nVocê consegue ler as mensagens em outra sessão? Então, pode transferir as mensagens de lá! Vá em Configurações > Dispositivos e confira se os dispositivos verificaram um ao outro. Quando abrir a conversa da próxima vez e ambas as sessões estiverem abertas, as chaves serão transmitidas automaticamente.\n\nNão gostaria de perder suas chaves quando sair ou trocar de dispositivos? Certifique-se que o backup de conversas esteja habilitado nas configurações.",
"@noKeyForThisMessage": {}
}
}
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_sk.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1418,4 +1418,4 @@
"@updateAvailable": {},
"updateNow": "Začať aktualizáciu na pozadí",
"@updateNow": {}
}
}
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
}
}
Loading

0 comments on commit aaa7c31

Please sign in to comment.