Merge pull request #88 from Pixel-Crusader/2.4

Added error activities
microservices-course-itmo · Apr 6, 2021 · a826c39 · a826c39
2 parents d718ad7 + c4e2a46
commit a826c39
Show file tree

Hide file tree

Showing 10 changed files with 169 additions and 31 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,42 +6,40 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
-        android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name="com.itmo.wineup.App">
-        <activity android:name=".features.auth.presentation.PhoneNumberAccessActivity"/>
-        <activity android:name=".features.auth.presentation.CodeInputActivity"/>
+        android:usesCleartextTraffic="true">
+        <activity android:name=".features.errors.ErrorPageNotFoundActivity"></activity>
+        <activity android:name=".features.errors.Error503Activity" />
+        <activity android:name=".features.errors.Error404Activity" />
+        <activity android:name=".features.auth.presentation.PhoneNumberAccessActivity" />
+        <activity android:name=".features.auth.presentation.CodeInputActivity" />
         <activity android:name=".features.auth.presentation.AgeAccessErrorActivity" />
-        <activity android:name=".features.auth.presentation.AgeAccessActivity" >
+        <activity android:name=".features.auth.presentation.AgeAccessActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".features.wine_info.WineInfoActivity" />
-
         <activity
             android:name=".MainActivity"
-            android:windowSoftInputMode="adjustPan">
-
-        </activity>
+            android:windowSoftInputMode="adjustPan" />
         <activity android:name=".features.auth.presentation.RegistrationActivity" />
 
         <service
-            android:name="com.itmo.wineup.network.firebase.CloudMessagingService"
+            android:name=".network.firebase.CloudMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
-        </service>
-
-        <!--Notification icon-->
+        </service> <!-- Notification icon -->
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_like_red" />

diff --git a/app/src/main/java/com/itmo/wineup/features/errors/Error404Activity.kt b/app/src/main/java/com/itmo/wineup/features/errors/Error404Activity.kt
@@ -0,0 +1,28 @@
+package com.itmo.wineup.features.errors
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.bumptech.glide.Glide
+import com.itmo.wineup.MainActivity
+import com.itmo.wineup.R
+import kotlinx.android.synthetic.main.error_404.*
+
+class Error404Activity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.error_404)
+        Glide.with(error_404_background)
+            .load(R.drawable.error_404_background)
+            .into(error_404_background)
+        withoutAuthButton.setOnClickListener {
+            val loginIntent = Intent(applicationContext, MainActivity::class.java)
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(loginIntent)
+        }
+        button_back.setOnClickListener {
+            finish()
+        }
+    }
+}
diff --git a/app/src/main/java/com/itmo/wineup/features/errors/Error503Activity.kt b/app/src/main/java/com/itmo/wineup/features/errors/Error503Activity.kt
@@ -0,0 +1,28 @@
+package com.itmo.wineup.features.errors
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.bumptech.glide.Glide
+import com.itmo.wineup.MainActivity
+import com.itmo.wineup.R
+import kotlinx.android.synthetic.main.error_503.*
+
+class Error503Activity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.error_503)
+        Glide.with(error_503_background)
+            .load(R.drawable.error_503_background)
+            .into(error_503_background)
+        withoutAuthButton.setOnClickListener {
+            val loginIntent = Intent(applicationContext, MainActivity::class.java)
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(loginIntent)
+        }
+        button_back.setOnClickListener {
+            finish()
+        }
+    }
+}
diff --git a/app/src/main/java/com/itmo/wineup/features/errors/ErrorPageNotFoundActivity.kt b/app/src/main/java/com/itmo/wineup/features/errors/ErrorPageNotFoundActivity.kt
@@ -0,0 +1,28 @@
+package com.itmo.wineup.features.errors
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.bumptech.glide.Glide
+import com.itmo.wineup.MainActivity
+import com.itmo.wineup.R
+import kotlinx.android.synthetic.main.page_not_found.*
+
+class ErrorPageNotFoundActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.page_not_found)
+        Glide.with(error_background)
+            .load(R.drawable.picture4)
+            .into(error_background)
+        withoutAuthButton.setOnClickListener {
+            val loginIntent = Intent(applicationContext, MainActivity::class.java)
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            loginIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            startActivity(loginIntent)
+        }
+        button.setOnClickListener {
+            finish()
+        }
+    }
+}
diff --git a/app/src/main/java/com/itmo/wineup/features/main/presentation/MainFragment.kt b/app/src/main/java/com/itmo/wineup/features/main/presentation/MainFragment.kt
@@ -1,12 +1,17 @@
 package com.itmo.wineup.features.main.presentation
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.ViewModelProvider
 import com.itmo.wineup.R
+import com.itmo.wineup.features.errors.Error404Activity
+import com.itmo.wineup.features.errors.Error503Activity
+import com.itmo.wineup.features.errors.ErrorPageNotFoundActivity
+import kotlinx.android.synthetic.main.fragment_main.*
 
 class MainFragment : Fragment() {
 
@@ -28,6 +33,15 @@ class MainFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         viewModel = ViewModelProvider(requireActivity()).get(MainViewModel::class.java)
+        button1.setOnClickListener {
+            startActivity(Intent(context, Error404Activity::class.java))
+        }
+        button2.setOnClickListener {
+            startActivity(Intent(context, Error503Activity::class.java))
+        }
+        button3.setOnClickListener {
+            startActivity(Intent(context, ErrorPageNotFoundActivity::class.java))
+        }
     }
 
 }
diff --git a/app/src/main/res/drawable/go_back_button_border.xml b/app/src/main/res/drawable/go_back_button_border.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@null" />
     <stroke android:width="1dp" android:color="@color/red"/>
     <corners
         android:radius="4dp"   >

diff --git a/app/src/main/res/layout/error_404.xml b/app/src/main/res/layout/error_404.xml
@@ -9,10 +9,10 @@
     <ImageView
         android:id="@+id/error_404_background"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:alpha="0.25"
+        android:layout_height="wrap_content"
+        android:alpha="0.1"
         android:scaleType="centerCrop"
-        android:src="@drawable/error_404_background"/>
+        app:layout_constraintTop_toBottomOf="@id/title"/>
 
     <TextView
         android:id="@+id/title"

diff --git a/app/src/main/res/layout/error_503.xml b/app/src/main/res/layout/error_503.xml
@@ -10,9 +10,10 @@
         android:id="@+id/error_503_background"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:alpha="0.25"
-        android:scaleType="centerCrop"
-        android:src="@drawable/error_503_background"
+        android:alpha="0.1"
+        android:scaleY="1.2"
+        android:scaleX="1.2"
+        android:translationX="20dp"
         tools:layout_editor_absoluteX="0dp"
         tools:layout_editor_absoluteY="0dp" />
 

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -1,14 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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=".features.main.presentation.MainFragment">
 
     <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Главная" />
+    <ImageView
+        android:id="@+id/logo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/wineup_logo"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</FrameLayout>
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="404"
+        app:layout_constraintEnd_toStartOf="@+id/button2"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/logo" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="503"
+        app:layout_constraintEnd_toStartOf="@+id/button3"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/button1"
+        app:layout_constraintTop_toBottomOf="@id/logo" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="PNF"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/button2"
+        app:layout_constraintTop_toBottomOf="@id/logo" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/page_not_found.xml b/app/src/main/res/layout/page_not_found.xml
@@ -3,32 +3,35 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@drawable/picture4"
     android:orientation="vertical">
 
+    <ImageView
+        android:id="@+id/error_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
     <TextView
         android:id="@+id/page_not_found"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="60dp"
-        android:layout_marginEnd="76dp"
         android:text="@string/page_not_found"
         android:textSize="25sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
-        android:layout_marginEnd="60dp"
         android:gravity="center_horizontal"
         android:text="@string/page_not_found_exception"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/page_not_found" />
 
     <Button
@@ -42,7 +45,6 @@
         android:textColor="@color/red"
         android:background="@drawable/go_back_button_border"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView2">
 
@@ -61,4 +63,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button" />
 
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>