...
This commit is contained in:
@ -2,7 +2,6 @@ import 'dart:convert';
|
||||
|
||||
import 'package:get/get.dart';
|
||||
import 'package:encrypt_shared_preferences/provider.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
import 'package:f0ckapp/models/user.dart';
|
||||
|
||||
@ -10,6 +9,8 @@ class AuthController extends GetxController {
|
||||
final EncryptedSharedPreferencesAsync storage =
|
||||
EncryptedSharedPreferencesAsync.getInstance();
|
||||
|
||||
final GetConnect http = GetConnect();
|
||||
|
||||
RxnString token = RxnString();
|
||||
Rxn<User> user = Rxn<User>();
|
||||
RxBool isLoading = false.obs;
|
||||
@ -38,7 +39,8 @@ class AuthController extends GetxController {
|
||||
if (token.value != null) {
|
||||
try {
|
||||
await http.post(
|
||||
Uri.parse('https://api.f0ck.me/logout'),
|
||||
'https://api.f0ck.me/logout',
|
||||
{},
|
||||
headers: {
|
||||
'Authorization': 'Bearer ${token.value}',
|
||||
'Content-Type': 'application/json',
|
||||
@ -55,13 +57,15 @@ class AuthController extends GetxController {
|
||||
isLoading.value = true;
|
||||
error.value = null;
|
||||
try {
|
||||
final http.Response response = await http.post(
|
||||
Uri.parse('https://api.f0ck.me/login'),
|
||||
final Response<dynamic> response = await http.post(
|
||||
'https://api.f0ck.me/login',
|
||||
json.encode({'username': username, 'password': password}),
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: json.encode({'username': username, 'password': password}),
|
||||
);
|
||||
if (response.statusCode == 200) {
|
||||
final dynamic data = json.decode(response.body);
|
||||
final dynamic data = response.body is String
|
||||
? json.decode(response.body)
|
||||
: response.body;
|
||||
if (data['token'] != null) {
|
||||
await saveToken(data['token']);
|
||||
user.value = User.fromJson(data);
|
||||
@ -83,12 +87,14 @@ class AuthController extends GetxController {
|
||||
Future<void> fetchUserInfo() async {
|
||||
if (token.value == null) return;
|
||||
try {
|
||||
final http.Response response = await http.get(
|
||||
Uri.parse('https://api.f0ck.me/login/check'),
|
||||
final Response<dynamic> response = await http.get(
|
||||
'https://api.f0ck.me/login/check',
|
||||
headers: {'Authorization': 'Bearer ${token.value}'},
|
||||
);
|
||||
if (response.statusCode == 200) {
|
||||
final dynamic data = json.decode(response.body);
|
||||
final dynamic data = response.body is String
|
||||
? json.decode(response.body)
|
||||
: response.body;
|
||||
user.value = User.fromJson(data);
|
||||
} else {
|
||||
await logout();
|
||||
|
@ -329,7 +329,9 @@ class _MediaDetailScreenState extends State<MediaDetailScreen> {
|
||||
),
|
||||
),
|
||||
if (isReady)
|
||||
SliverToBoxAdapter(
|
||||
SliverFillRemaining(
|
||||
hasScrollBody: false,
|
||||
fillOverscroll: true,
|
||||
child: GestureDetector(
|
||||
onTap: () => settingsController.hideVideoControls(),
|
||||
behavior: HitTestBehavior.translucent,
|
||||
|
@ -133,6 +133,7 @@ class _MediaGridBody extends StatelessWidget {
|
||||
final SettingsController settingsController;
|
||||
final ScrollController scrollController;
|
||||
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return PullexRefresh(
|
||||
|
@ -4,13 +4,13 @@ import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
import 'package:f0ckapp/controller/mediacontroller.dart';
|
||||
import 'package:f0ckapp/models/suggestion.dart';
|
||||
|
||||
class CustomSearchDelegate extends SearchDelegate<String> {
|
||||
final MediaController controller = Get.find<MediaController>();
|
||||
final GetConnect http = GetConnect();
|
||||
Timer? _debounceTimer;
|
||||
List<Suggestion>? _suggestions;
|
||||
bool _isLoading = false;
|
||||
@ -48,14 +48,16 @@ class CustomSearchDelegate extends SearchDelegate<String> {
|
||||
}
|
||||
|
||||
Future<List<Suggestion>> fetchSuggestions(String query) async {
|
||||
final Uri uri = Uri.parse('https://api.f0ck.me/search/?q=$query');
|
||||
final String url = 'https://api.f0ck.me/search/?q=$query';
|
||||
try {
|
||||
final http.Response response = await http
|
||||
.get(uri)
|
||||
final Response<dynamic> response = await http
|
||||
.get(url)
|
||||
.timeout(const Duration(seconds: 5));
|
||||
|
||||
if (response.statusCode == 200) {
|
||||
final dynamic decoded = jsonDecode(response.body);
|
||||
final dynamic decoded = response.body is String
|
||||
? jsonDecode(response.body)
|
||||
: response.body;
|
||||
if (decoded is List) {
|
||||
final suggestions = decoded
|
||||
.map((item) => Suggestion.fromJson(item as Map<String, dynamic>))
|
||||
@ -66,7 +68,9 @@ class CustomSearchDelegate extends SearchDelegate<String> {
|
||||
throw Exception('Unerwartetes Format: Es wurde eine Liste erwartet.');
|
||||
}
|
||||
} else if (response.statusCode == 400) {
|
||||
final dynamic error = jsonDecode(response.body);
|
||||
final dynamic error = response.body is String
|
||||
? jsonDecode(response.body)
|
||||
: response.body;
|
||||
final String message = error is Map<String, dynamic>
|
||||
? error['detail']?.toString() ?? 'Unbekannter Fehler.'
|
||||
: 'Unbekannter Fehler.';
|
||||
|
Reference in New Issue
Block a user