diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c3ef2951e8867b9d32b1a9a6df4d53f306c6ccbc..bb67304da4f3437ba5138b03f59b19fff288428b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,11 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + android.applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "fast_track_taxi-release-${variant.versionName}.apk" + } + } } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5f01f7327f50567c9ed03039ab353a1d3036c29f..fc2120f617b77725d5ce458c4f90ee27ef159a9e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,21 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" package="com.example.fasttracktaxi"> <application android:allowBackup="true" - android:icon="@mipmap/ic_launcher" + android:icon="@drawable/fast_track_taxi_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> - <activity android:name=".MainActivity"> + android:theme="@style/AppTheme" + tools:ignore="GoogleAppIndexingWarning"> + + <activity android:name=".SplashScreen" + android:label="@string/app_name" + android:screenOrientation="portrait" + android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> + + <activity android:name=".Main2Activity" + android:label="@string/app_name" + android:screenOrientation="portrait"> + <intent-filter> + <action android:name="android.intent.action.Main2Activity" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter></activity> </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/fasttracktaxi/MainActivity.java b/app/src/main/java/com/example/fasttracktaxi/MainActivity.java deleted file mode 100644 index 895760a867042c6ecf005f2e5ed0b4b053805cf0..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/example/fasttracktaxi/MainActivity.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.fasttracktaxi; - -import androidx.appcompat.app.AppCompatActivity; - -import android.os.Bundle; - -public class MainActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - } -} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 4fc244418b5fe524789352d1b1b52d1b22045f3a..0000000000000000000000000000000000000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".MainActivity"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Hello World!" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - -</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69b22338c6510250df3b43672635120dbce2fa49..b415b748a76a425aea4c0e61e6f35b2221716e6c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="colorPrimary">#008577</color> + <color name="colorPrimary">#26D3C1</color> <color name="colorPrimaryDark">#00574B</color> - <color name="colorAccent">#D81B60</color> + <color name="colorAccent">#142FDB</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea4015c7a4c53e702339076cfd1639fabe22c8be..a57ad8ba675e614dfca5c6c16ef6b490ed1da3c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,10 @@ <resources> <string name="app_name">Fast Track Taxi</string> + <string name="hello">Hello</string> + <string name="splash_screen">SPLASH SCREEN</string> + <string name="welcome_text">FAST \n\nTRACK \n\nTAXI</string> + <string name="exit">Exit</string> + <string name="add">Add</string> + <string name="reset">Reset</string> + <string name="about">About</string> </resources>