Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
API_URL=https://avah-pollinical-randal.ngrok-free.dev/
# API_URL=https://app-dbef67eb-9a2e-44fa-abff-3e8b83204d9c.cleverapps.io/
# API_URL=https://node.shoy.publicvm.com/
API_URL=https://node.shoy.publicvm.com/
# API_test_URL=https://example.com/
# API_URL=https://wanita-hypernormal-cherise.ngrok-free.dev/
# API_URL=https://avah-pollinical-randal.ngrok-free.dev/
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"cmake.sourceDirectory": "D:/ThirdYear/SWE/project/Cross_Platform/linux"
"cmake.sourceDirectory": "C:/Users/kerol/Cross_Platform/linux"
}
49 changes: 37 additions & 12 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,40 @@
import java.util.Properties
import java.io.FileInputStream

plugins {
id("com.android.application")
id("kotlin-android")
id("dev.flutter.flutter-gradle-plugin")
id("com.google.gms.google-services")

}

android {
namespace = "com.Artemsia.lite_x"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

signingConfigs {
getByName("debug") {
storeFile = file("debug.keystore")
storePassword = "android"
keyAlias = "androiddebugkey"
keyPassword = "android"
}

create("release") {
val keystoreProperties = Properties()
val keystorePropertiesFile = rootProject.file("key.properties")
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
}

storeFile = file(keystoreProperties["storeFile"] as String)
storePassword = keystoreProperties["storePassword"] as String
keyAlias = keystoreProperties["keyAlias"] as String
keyPassword = keystoreProperties["keyPassword"] as String
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand All @@ -21,32 +45,33 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.Artemsia.lite_x"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
buildTypes {
getByName("debug") {
signingConfig = signingConfigs.getByName("debug")
}
getByName("release") {
signingConfig = signingConfigs.getByName("release")
isMinifyEnabled = false
isShrinkResources = false
}
}


}

dependencies {
implementation("com.squareup.okhttp3:okhttp:4.12.0")
implementation(platform("com.google.firebase:firebase-bom:33.5.1"))
implementation("com.google.firebase:firebase-messaging")
}


flutter {
source = "../.."
}
}
21 changes: 7 additions & 14 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,34 @@
{
"project_info": {
"project_number": "123824690535",
"project_id": "litex-3c6f1",
"storage_bucket": "litex-3c6f1.firebasestorage.app"
"project_number": "112144721859",
"project_id": "psychic-fin-474008-h8",
"storage_bucket": "psychic-fin-474008-h8.firebasestorage.app"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:123824690535:android:f0760abf0029e802960bc2",
"mobilesdk_app_id": "1:112144721859:android:227c69fccfe2ec4c813f76",
"android_client_info": {
"package_name": "com.Artemsia.lite_x"
}
},
"oauth_client": [
{
"client_id": "123824690535-52cesp7okt1d8j63pn7su9rtmi0asq0b.apps.googleusercontent.com",
"client_id": "112144721859-3i16bpjr6jd704h3imdsp4ojodv7t64l.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDYiU34-5-Rr2nP_SHphvLSIiOyr4RuC8I"
"current_key": "AIzaSyAPqcctNBpWkQ-BKvYsHUEjvc_iwPBwsZ0"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "123824690535-52cesp7okt1d8j63pn7su9rtmi0asq0b.apps.googleusercontent.com",
"client_id": "112144721859-3i16bpjr6jd704h3imdsp4ojodv7t64l.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "123824690535-5pta8j3mu07g0bb21n43n8q2vuulrstr.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.example.litex"
}
}
]
}
Expand Down
1 change: 1 addition & 0 deletions lib/features/home/view/widgets/home_app_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_riverpod/legacy.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:lite_x/core/providers/current_user_provider.dart';
import 'package:lite_x/features/home/view/widgets/home_tab_bar.dart';
import 'package:lite_x/features/home/view/widgets/profile_avatar.dart';

Expand Down
19 changes: 1 addition & 18 deletions lib/features/profile/models/profile_tweet_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ class ProfileTweetModel {
final TweetType type;
final List<String> mediaIds;
final String parentId;
final String retweeterName;
final String retweeterUserName;
final List<Map<String, String>> hashtags;

ProfileTweetModel({
required this.id,
Expand All @@ -48,9 +45,6 @@ class ProfileTweetModel {
required this.type,
required this.mediaIds,
required this.parentId,
required this.retweeterName,
required this.retweeterUserName,
required this.hashtags,
});

factory ProfileTweetModel.fromJson(Map<String, dynamic> json) {
Expand All @@ -68,15 +62,6 @@ class ProfileTweetModel {
// final List<String> meidaIds = mediaIdsRes.map((json) {
// return json["mediaId"] as String;
// }).toList();
final hashtagsList = json["hashtags"];
final List<Map<String, String>> hashtagsModelList = hashtagsList
.map((h) {
final String id = h["hash"]?["id"] ?? "";
final String tag_name = h["hash"]?["tag_text"] ?? "";
return ({"hashtagName": tag_name, "id": id});
})
.toList()
.cast<Map<String, String>>();
return ProfileTweetModel(
id: json['id'] ?? "",
text: json['content'] ?? "",
Expand All @@ -98,9 +83,7 @@ class ProfileTweetModel {
protectedAccount: json["user"]?["protectedAccount"] ?? false,
verified: json["user"]?["verified"] ?? false,
parentId: json["parentId"] ?? "",
retweeterName: json["retweeter"]?["name"] ?? "",
retweeterUserName: json["retweeter"]?["username"] ?? "",
hashtags: hashtagsModelList,
// mediaIds: meidaIds,
);
}
// ------------------------------------------
Expand Down
Loading
Loading