Revert "kljk"

This reverts commit d28663d, reversing
changes made to 143b88e.

Author: oguzhnatly

android/app/build.gradle

@@ -37,7 +37,6 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.deadcode_hackathon"
         minSdkVersion 16
-        multiDexEnabled true
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
@@ -57,6 +56,5 @@ flutter {
 }
 
 dependencies {
-    implementation 'com.android.support:multidex:1.0.3'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

lib/app/routes.dart

@@ -1,8 +1,4 @@
-import 'package:eogretmen/views/detail.dart';
-import 'package:eogretmen/views/signin.dart';
-import 'package:eogretmen/views/signup.dart';
 import 'package:flutter/material.dart';
-<<<<<<< HEAD
 import 'package:eogretmen/widgets/main_app_widget.dart';
 import 'package:eogretmen/views/search/search_view.dart';
 import 'package:eogretmen/views/splash/splash_view.dart';
@@ -14,17 +10,7 @@ class AppRouteGenerator {
   static const String APP_ROUTE_LOGIN = "/LogIn";
   static const String APP_ROUTE_REGISTER = "/Register";
   static const String APP_ROUTE_SEARCH = "/Search";
-=======
-import 'package:eogretmen/views/splash_view.dart';
-
-class AppRouteGenerator {
-  static const String APP_ROUTE_SPLASH = "/Splash";
-  static const String APP_ROUTE_LOGIN = "/SignIn";
-  static const String APP_ROUTE_SIGNUP = "/SignUp";
->>>>>>> burkay
   static const String APP_ROUTE_HOME = "/Home";
-  static const String APP_ROUTE_DETAIL = "/Details";
-  static const String APP_ROUTE_PROFILE = "/Details";
 
   Route getAppRoutes(RouteSettings routeSettings) {
     switch (routeSettings.name) {
@@ -39,21 +25,7 @@ class AppRouteGenerator {
         return MaterialPageRoute<void>(
           fullscreenDialog: true,
           settings: routeSettings,
-          builder: (BuildContext context) => Sign(),
-        );
-
-      case APP_ROUTE_SIGNUP:
-        return MaterialPageRoute<void>(
-          fullscreenDialog: true,
-          settings: routeSettings,
-          builder: (BuildContext context) => Register(),
-        );
-
-      case APP_ROUTE_DETAIL:
-        return MaterialPageRoute<void>(
-          fullscreenDialog: true,
-          settings: routeSettings,
-          builder: (BuildContext context) => Details(),
+          builder: (BuildContext context) => LogIn(),
         );
 
       case APP_ROUTE_REGISTER:

lib/img/2.png

@@ -4,10 +4,7 @@ class ThemeColors {
   static const Color WHITE = Color(0xffFFFFFF);
   static const Color BLACK = Color(0xff000000);
   static const Color GRAY = Color(0xff757575);
-<<<<<<< HEAD
   static const Color LIGHT_GRAY = Color(0xffF5F5F7);
-=======
->>>>>>> burkay
 
   static const Color LIGHT_BLUE = Color(0xff93A7E1);
   static const Color LIGHT_NAVY_BLUE = Color(0xff3c435e);