Merge pull request #9 from ngomile/main

Add JobsListBloc and Perform Various Changes to Logic

Author: ngomile

android/app/build.gradle

@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,18 +22,9 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
 android {
-    compileSdkVersion 34
+    namespace "com.doreanbyte.katswiri"
+    compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -49,37 +41,20 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.doreanbyte.katswiri"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 19
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
-    signingConfigs {
-       release {
-           keyAlias keystoreProperties['keyAlias']
-           keyPassword keystoreProperties['keyPassword']
-           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-           storePassword keystoreProperties['storePassword']
-       }
-   }
-
-   buildTypes {
-       release {
-           signingConfig signingConfigs.release
-       }
-   }
-
+    buildTypes {
+        release {
+            signingConfig signingConfigs.debug
+        }
+    }
 }
 
 flutter {
     source '../..'
 }
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.22'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.1.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

devtools_options.yaml

@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:

lib/app_theme.dart

@@ -27,11 +27,12 @@ ThemeData buildTheme({ColorScheme? scheme, required Brightness brightness}) {
   final isDark = brightness == Brightness.dark;
   final defScheme = isDark ? darkScheme : lightScheme;
   final colorScheme = scheme?.harmonized() ?? defScheme;
-  final origin = isDark ? ThemeData.dark() : ThemeData.light();
+  final origin = isDark
+      ? ThemeData.dark(useMaterial3: true)
+      : ThemeData.light(useMaterial3: true);
 
   return origin.copyWith(
-    useMaterial3: true,
-    colorScheme: colorScheme.copyWith(background: colorScheme.surface),
+    colorScheme: colorScheme.copyWith(surface: colorScheme.surface),
     scaffoldBackgroundColor: isDark ? Colors.black87 : const Color(0xFFF2F2F2),
     tabBarTheme: origin.tabBarTheme.copyWith(
       unselectedLabelColor: isDark ? Colors.white70 : Colors.black54,

lib/bloc/bloc.dart

@@ -3,3 +3,4 @@ export 'saved_jobs_bloc/saved_jobs_bloc.dart';
 export 'save_job_bloc/save_job_bloc.dart';
 export 'job_description_bloc/job_description_bloc.dart';
 export 'theme_bloc/theme_bloc.dart';
+export 'jobs_list_bloc/jobs_list_bloc.dart';

lib/bloc/jobs_list_bloc/jobs_list_bloc.dart

@@ -0,0 +1,57 @@
+library job_list_bloc;
+
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:katswiri/models/models.dart';
+import 'package:katswiri/sources/sources.dart';
+
+part 'jobs_list_event.dart';
+part 'jobs_list_state.dart';
+
+final class JobsListBloc extends Bloc<JobsListEvent, JobsListState> {
+  final List<Job> _jobs = [];
+  final Source _source;
+  int _page = 1;
+
+  JobsListBloc({required Source source})
+      : _source = source,
+        super(const JobsListLoading(jobs: [])) {
+    on<FetchJobs>((event, emit) async {
+      try {
+        emit(JobsListLoading(jobs: _jobs));
+        final jobs = await _getJobs(filter: event.filter);
+
+        _jobs.addAll(jobs);
+        emit(JobsListLoaded(jobs: _jobs));
+      } on Exception catch (e) {
+        emit(JobsListError(
+          jobs: _jobs,
+          error: e.toString(),
+        ));
+      }
+    });
+
+    on<RefreshJobs>((event, emit) async {
+      try {
+        _jobs.clear();
+        _page = 1;
+        emit(JobsListLoading(jobs: _jobs));
+
+        final jobs = await _getJobs(filter: event.filter);
+        _jobs.addAll(jobs);
+        emit(JobsListLoaded(jobs: _jobs));
+      } on Exception catch (e) {
+        emit(JobsListError(jobs: _jobs, error: e.toString()));
+      }
+    });
+  }
+
+  Future<List<Job>> _getJobs({Map<String, String>? filter}) async {
+    final jobs = await _source.fetchJobs(
+      page: _page,
+      filter: filter,
+    );
+    _page++;
+
+    return jobs;
+  }
+}

lib/bloc/jobs_list_bloc/jobs_list_event.dart

@@ -0,0 +1,17 @@
+part of 'jobs_list_bloc.dart';
+
+sealed class JobsListEvent {
+  const JobsListEvent();
+}
+
+final class FetchJobs extends JobsListEvent {
+  const FetchJobs({this.filter});
+
+  final Map<String, String>? filter;
+}
+
+final class RefreshJobs extends JobsListEvent {
+  const RefreshJobs({this.filter});
+
+  final Map<String, String>? filter;
+}

lib/bloc/jobs_list_bloc/jobs_list_state.dart

@@ -0,0 +1,27 @@
+part of 'jobs_list_bloc.dart';
+
+sealed class JobsListState {
+  const JobsListState();
+}
+
+final class JobsListLoading extends JobsListState {
+  const JobsListLoading({required this.jobs});
+
+  final List<Job> jobs;
+}
+
+final class JobsListLoaded extends JobsListState {
+  const JobsListLoaded({required this.jobs});
+
+  final List<Job> jobs;
+}
+
+final class JobsListError extends JobsListState {
+  const JobsListError({
+    required this.jobs,
+    required this.error,
+  });
+
+  final List<Job> jobs;
+  final String error;
+}

lib/components/components.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:katswiri/app_theme.dart';
 
 export 'job_model_widgets.dart';
-export 'job_list_retriever.dart';
+export 'job_listings.dart';
 export 'tabbed_sources.dart';
 export 'button_widgets.dart';