Merge pull request #17 from vinnytsiasamungitschool/DesignApp

Design app
Urdzik · Apr 22, 2019 · df03da8 · df03da8
2 parents d8c3436 + 173b96c
commit df03da8
Show file tree

Hide file tree

Showing 16 changed files with 127 additions and 35 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,6 +51,8 @@ dependencies {
     implementation 'com.yarolegovich:discrete-scrollview:1.4.9'
     //Google Maps
     implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    //Page Indicator
+    implementation 'com.github.chahine:pageindicator:0.2.7'
 }
 //Google Plugin
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/com/company/archapp/ActivitySplash.kt b/app/src/main/java/com/company/archapp/ActivitySplash.kt
@@ -17,7 +17,7 @@ class ActivitySplash : AppCompatActivity() {
         textView = findViewById(R.id.tv)
 
         val typeface = Typeface.createFromAsset(assets, "fonts/ProductSans-Bold.ttf")
-        textView!!.typeface = typeface
+        textView?.typeface = typeface
 
         //Code to start timer and take action after the timer ends
         Handler().postDelayed({

diff --git a/app/src/main/java/com/company/archapp/InfoActivity.kt b/app/src/main/java/com/company/archapp/InfoActivity.kt
@@ -34,9 +34,9 @@ class InfoActivity : AppCompatActivity() {
         setSupportActionBar(toolbar)
 
         //Button backwards
-        Objects.requireNonNull<ActionBar>(supportActionBar).setDisplayHomeAsUpEnabled(true)
-        supportActionBar!!.setHomeButtonEnabled(true)
-        supportActionBar!!.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setHomeButtonEnabled(true)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
         toolbar.setNavigationOnClickListener { onBackPressed() }
     }
 

diff --git a/app/src/main/java/com/company/archapp/ResultActivity.kt b/app/src/main/java/com/company/archapp/ResultActivity.kt
@@ -3,6 +3,7 @@ package com.company.archapp
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Typeface
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
@@ -12,10 +13,8 @@ import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.ImageView
-import android.widget.ProgressBar
-import android.widget.TextView
-import android.widget.Toast
+import android.widget.*
+import com.chahinem.pageindicator.PageIndicator
 import com.company.archapp.image.ImagesFromEthernet
 import com.google.android.gms.maps.model.LatLng
 import com.google.firebase.ml.vision.FirebaseVision
@@ -29,32 +28,38 @@ import java.util.*
 
 class ResultActivity : AppCompatActivity() {
 
-    private val slidingPanelLayout by lazy { findViewById<SlidingUpPanelLayout>(R.id.sliding_panel)!! }
+    private val slidingPanelLayout by lazy { findViewById<SlidingUpPanelLayout>(R.id.sliding_panel) }
     private val landmarkIv by lazy { findViewById<ImageView>(R.id.landmark_iv) }
     private val landmarkTv by lazy { findViewById<TextView>(R.id.landmark_tv) }
     private val resultPb by lazy { findViewById<ProgressBar>(R.id.result_pb) }
     private val informationTv by lazy { findViewById<TextView>(R.id.information_tv) }
     private val landmarkContentDSV by lazy { findViewById<DiscreteScrollView>(R.id.landmark_content_dsv) }
-    //    private val mapFragment by lazy { supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment }
+    private val dotsPi by lazy { findViewById<PageIndicator>(R.id.dots) }
+    private val wikiInfoBt by lazy { findViewById<Button>(R.id.wiki_site_bt) }
     private val wk = WikipediaClass()
     private val iF = ImagesFromEthernet()
     private var nameOfLandmark: String? = null // Name of recognized landmark
     private var latitude: Double? = null // Latitude of recognized landmark
     private var longitude: Double? = null // Longitude of recognized landmark
+    private lateinit var tp: Typeface
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_result)
 
+        // Font button browser wiki
+        tp = Typeface.createFromAsset(assets, "fonts/ProductSans-Bold.ttf")
+        wikiInfoBt.typeface = tp
+
         // Find the toolbar
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         toolbar.title = ""
         setSupportActionBar(toolbar)
 
         //Button backwards
-        Objects.requireNonNull<ActionBar>(supportActionBar).setDisplayHomeAsUpEnabled(true)
-        supportActionBar!!.setHomeButtonEnabled(true)
-        supportActionBar!!.setDisplayShowTitleEnabled(false)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setHomeButtonEnabled(true)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
         toolbar.setNavigationOnClickListener { onBackPressed() }
 
         // Add simple transformer to DSV
@@ -65,14 +70,18 @@ class ResultActivity : AppCompatActivity() {
                 .build()
         )
 
-//        mapFragment.getMapAsync(this)
-
         // Get image from intent
         val intent = intent
         val imageUri = intent.getParcelableExtra<Uri>(WelcomeActivity.IMAGE_URI)
 
         // Analyze our image
         analyzeImage(MediaStore.Images.Media.getBitmap(contentResolver, imageUri))
+
+        // Button browser wiki
+        wikiInfoBt.setOnClickListener {
+            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://en.wikipedia.org/wiki/$nameOfLandmark"))
+            startActivity(browserIntent)
+        }
     }
 
     // Find the menu
@@ -129,9 +138,9 @@ class ResultActivity : AppCompatActivity() {
                     landmarkTv.text = nameOfLandmark
 
                     wk.findWikipediaText(nameOfLandmark, informationTv, resultPb, slidingPanelLayout)
-//                    longitude?.let { it1 -> latitude?.let { it2 -> map.map(it2, it1) } }
 
-                    iF.putNameOfLandmarkToImage(nameOfLandmark, landmarkContentDSV, this@ResultActivity,
+                    iF.putNameOfLandmarkToImage(
+                        nameOfLandmark, landmarkContentDSV, dotsPi, this@ResultActivity,
                         latitude?.let { it1 -> longitude?.let { it2 -> LatLng(it1, it2) } })
                 } else {
                     landmarkTv.text = "Landmark not recognized"

diff --git a/app/src/main/java/com/company/archapp/WelcomeActivity.kt b/app/src/main/java/com/company/archapp/WelcomeActivity.kt
@@ -22,7 +22,7 @@ class WelcomeActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_welcome)
 
-        tp = Typeface.createFromAsset(assets, "fonts/ProductSans-Black.ttf")
+        tp = Typeface.createFromAsset(assets, "fonts/ProductSans-Bold.ttf")
         recognizeBtn.typeface = tp
 
         // Find the toolbar

diff --git a/app/src/main/java/com/company/archapp/image/ImagesFromEthernet.java b/app/src/main/java/com/company/archapp/image/ImagesFromEthernet.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.util.Log;
+import com.chahinem.pageindicator.PageIndicator;
 import com.company.archapp.image.img.ImageDownloader;
 import com.google.android.gms.maps.model.LatLng;
 import com.yarolegovich.discretescrollview.DiscreteScrollView;
@@ -22,7 +23,7 @@ public class ImagesFromEthernet {
     private ImageDownloader myImg;
     private String[] urls = new String[4];
 
-    public String[] putNameOfLandmarkToImage(String name, final DiscreteScrollView discreteScrollView, final Context context, final LatLng latLng) {
+    public String[] putNameOfLandmarkToImage(String name, final DiscreteScrollView discreteScrollView, final PageIndicator pageIndicator, final Context context, final LatLng latLng) {
 
         NetworkService.getInstance()
                 .getImgApi()
@@ -36,7 +37,7 @@ public void onResponse(Call<ImageDownloader> call, Response<ImageDownloader> res
                             for (int i = 0; i < urls.length; i++)
                                 urls[i] = myImg.getResults()[i].getUrls().getRegular();
 
-                            generateDataForDSV(urls, discreteScrollView, context, latLng);
+                            generateDataForDSV(urls, discreteScrollView, pageIndicator, context, latLng);
                         } else {
                             Log.d(TAG, "Query error");
                         }
@@ -50,7 +51,7 @@ public void onFailure(Call<ImageDownloader> call, Throwable t) {
         return urls;
     }
 
-    private void generateDataForDSV(String[] urls, DiscreteScrollView discreteScrollView, Context context, LatLng latLng) {
+    private void generateDataForDSV(String[] urls, DiscreteScrollView discreteScrollView, PageIndicator pageIndicator, Context context, LatLng latLng) {
 
         List<LandmarkContentItem> landmarkContentItems = new ArrayList<>();
 
@@ -60,5 +61,7 @@ private void generateDataForDSV(String[] urls, DiscreteScrollView discreteScroll
 
         LandmarkContentAdapter adapter = new LandmarkContentAdapter(landmarkContentItems, context);
         discreteScrollView.setAdapter(adapter);
+
+        pageIndicator.attachTo(discreteScrollView);
     }
 }
diff --git a/app/src/main/res/drawable/background_intruction.xml b/app/src/main/res/drawable/background_intruction.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+
+    <solid android:color="@android:color/white"/>
+    <stroke
+                    android:width="1dip"
+            android:color="#ffffff"/>
+</shape>
diff --git a/app/src/main/res/drawable/button_botton.xml b/app/src/main/res/drawable/button_botton.xml
@@ -3,7 +3,7 @@
        android:shape="rectangle">
 
     <corners
-            android:radius="15dp"/>
+            android:radius="30dp"/>
 
     <solid android:color="#3CA773"/>
 

diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -15,7 +15,7 @@
 
     <TextView
             android:textStyle="bold"
-            android:textColor="#88929292"
+            android:textColor="#B3B3B3"
             android:id="@+id/tv"
             android:textSize="30sp"
             android:layout_marginBottom="60dp"

diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
@@ -16,9 +16,10 @@
             app:theme="@style/ThemeOverlay.AppCompat.ActionBar"/>
 
     <Button
+
             android:layout_margin="16dp"
             android:textColor="#fff"
-            android:textSize="18sp"
+            android:textSize="19sp"
             android:textAllCaps="false"
             android:fontFamily="sans-serif"
             android:background="@drawable/button_botton"
@@ -29,6 +30,7 @@
             android:layout_alignParentBottom="true"/>
 
 
+
     <ImageView
             android:layout_marginTop="460dp"
             android:layout_marginStart="200dp"
@@ -51,7 +53,7 @@
 
     <ImageView
             android:layout_marginTop="160dp"
-            android:layout_marginStart="78dp"
+            android:layout_marginStart="40dp"
             android:src="@drawable/marker"
             android:layout_width="38dp"
             android:layout_height="38dp"/>
@@ -78,4 +80,7 @@
             android:layout_height="38dp"/>
 
 
+    <include layout="@layout/info_text"/>
+
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/info_text.xml b/app/src/main/res/layout/info_text.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="250dp"
+              android:layout_height="wrap_content"
+              android:layout_centerHorizontal="true"
+              android:layout_marginTop="100dp"
+              android:background="@drawable/background_intruction"
+              android:padding="5dp">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textSize="17.7sp"
+            android:text="@string/title_instruction"
+            android:textColor="#5F5F5F"/>
+    <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/instruction"
+            android:textColor="#575757"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/landmark_content_map.xml b/app/src/main/res/layout/landmark_content_map.xml
@@ -4,4 +4,6 @@
         android:id="@+id/map_layout"
         android:orientation="vertical"
         android:layout_width="280dp"
-        android:layout_height="210dp"/>
+        android:layout_height="200dp"
+        android:layout_margin="4dp"
+        android:layout_gravity="center"/>
diff --git a/app/src/main/res/layout/sleding_up.xml b/app/src/main/res/layout/sleding_up.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_marginTop="@dimen/margin_top_sliding_panel"
         android:id="@+id/dragview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:background="@drawable/sliding_panel_radius"
-        android:paddingLeft="@dimen/default_padding"
-        android:paddingRight="@dimen/default_padding"
-        android:paddingTop="@dimen/top_padding"
+        android:paddingTop="@dimen/default_padding"
         tools:context=".ResultActivity">
 
     <View android:layout_gravity="center"
@@ -19,6 +18,8 @@
           android:layout_height="@dimen/button_sliding_height"/>
 
     <TextView
+            android:paddingLeft="@dimen/default_padding"
+            android:paddingRight="@dimen/default_padding"
             android:textStyle="bold"
             android:textColor="@color/color_name_landmark"
             android:layout_marginBottom="8dp"
@@ -30,7 +31,9 @@
             android:layout_height="wrap_content"/>
 
     <TextView
-            android:maxLines="10"
+            android:paddingLeft="@dimen/default_padding"
+            android:paddingRight="@dimen/default_padding"
+            android:maxLines="7"
             android:ellipsize="end"
             android:textColor="@color/color_info_landmark"
             android:layout_marginStart="@dimen/top_padding"
@@ -39,12 +42,35 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
+
+    <Button
+            android:id="@+id/wiki_site_bt"
+            android:textSize="18sp"
+            android:textAllCaps="false"
+            android:textColor="@color/sliding_panel_color"
+            android:text="@string/read_more"
+            android:layout_marginTop="16dp"
+            android:layout_width="170dp"
+            android:layout_height="40dp"
+            android:background="@drawable/button_botton"
+            android:layout_gravity="center"/>
+
+
     <com.yarolegovich.discretescrollview.DiscreteScrollView
             android:background="@color/sliding_panel_color"
-            android:layout_marginTop="38dp"
+            android:layout_marginTop="28dp"
             android:id="@+id/landmark_content_dsv"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="200dp"
             app:dsv_orientation="horizontal"/>
 
+    <com.chahinem.pageindicator.PageIndicator
+            android:id="@+id/dots"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="20dp"
+            app:piDotBound="70dp"
+            app:piSelectedColor="#3CA773"
+            app:piSize1="10dp"/>
 </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="panel_height">98dp</dimen>
+    <dimen name="panel_height">90dp</dimen>
     <dimen name="panel_shadow_height">1dp</dimen>
     <dimen name="welcome_text_size">28sp</dimen>
     <dimen name="welcome_margin_top">56dp</dimen>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,4 +9,15 @@
     <string name="kostia_levitskiy">Kostia Levitskiy</string>
     <string name="anton_sizov">Anton Sizov</string>
     <string name="slavik_urdzik">Slavik Urdzik</string>
+    <string name="read_more">Read more</string>
+    <string name="title_instruction">How to use our app very easy:</string>
+    <string name="instruction">
+        \n I. Try to click the button Recognize landmark
+        \n
+        \n II. Successfully?) Choose image from gallery or use camera for recognizing
+        \n
+        \n III. Then crop
+        \n
+        \n IV. Final level: catch info, images and google map about the place
+    </string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-
+        maven { url 'https://jitpack.io' }
     }
 }