changes

clonalejandro · Aug 18, 2018 · 89720f7 · 89720f7
1 parent 2c61bc6
commit 89720f7
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 26 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/release/output.json b/app/release/output.json
@@ -0,0  1 @@
 [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/.DS_Store b/app/src/.DS_Store
diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,9  8,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:roundIcon="@mipmap/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.NoActionBar"
         tools:ignore="AllowBackup, GoogleAppIndexingWarning">

diff --git a/app/src/main/java/.DS_Store b/app/src/main/java/.DS_Store
diff --git a/app/src/main/java/io/.DS_Store b/app/src/main/java/io/.DS_Store
diff --git a/app/src/main/java/io/clonalejandro/.DS_Store b/app/src/main/java/io/clonalejandro/.DS_Store
diff --git a/app/src/main/java/io/clonalejandro/avmoda/MainActivity.kt b/app/src/main/java/io/clonalejandro/avmoda/MainActivity.kt
@@ -2,7  2,9 @@ package io.clonalejandro.avmoda
 
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 
 import io.clonalejandro.avmoda.utils.WebVieu
 
 import kotlinx.android.synthetic.main.activity_main.*
 
 /**
@@ -29,7  31,7 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        WebVieu("https", "twitter.com", webview)
         WebVieu("https://shop.spreadshirt.es/avmoda", webview)
     }
 
 

diff --git a/app/src/main/java/io/clonalejandro/avmoda/SplashScreen.kt b/app/src/main/java/io/clonalejandro/avmoda/SplashScreen.kt
@@ -1,16  1,11 @@
 package io.clonalejandro.avmoda
 
-import android.annotation.SuppressLint
 import android.content.Intent
-import android.graphics.drawable.AnimationDrawable
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
-import android.view.View
-import io.clonalejandro.avmoda.R.id.splash_layout
-import io.clonalejandro.avmoda.animations.SplashAnimation
 import android.support.v7.app.AppCompatActivity
 
 import io.clonalejandro.avmoda.animations.SplashAnimation
 import io.clonalejandro.avmoda.tasks.SplashTask
-import org.jetbrains.annotations.NotNull
 
 /**
  * Created by alejandrorioscalera

diff --git a/app/src/main/java/io/clonalejandro/avmoda/utils/WebVieu.kt b/app/src/main/java/io/clonalejandro/avmoda/utils/WebVieu.kt
@@ -25,17  25,15 @@ import kotlin.properties.Delegates
  * All rights reserved for clonalejandro ©AVModa 2017 / 2018
  */
 
-class WebVieu(protocol: String, url: String, webView: WebView) {
 class WebVieu(url: String, webView: WebView) {
 
 
     /** SMALL CONSTRUCTORS **/
 
-    private var protocol: String by Delegates.notNull()
     private var url: String by Delegates.notNull()
     private var webView: WebView by Delegates.notNull()
 
     init {
-        this.protocol = protocol
         this.url = url
         this.webView = webView
 
@@ -56,18  54,6 @@ class WebVieu(protocol: String, url: String, webView: WebView) {
 
     /** OTHERS **/
 
-    /**
-     * This function build the url with the network protocol
-     * @throws UnsupportedOperationException
-     */
-    @Throws (UnsupportedOperationException::class)
-    private fun buildUrl() : String {
-        val builder = Uri.Builder()
-        builder.scheme(protocol).authority(url)
-        return builder.build().toString()
-    }
-
-
     /**
      * This function build the WebView class with the configurations
      */
@@ -95,7  81,7 @@ class WebVieu(protocol: String, url: String, webView: WebView) {
     private fun loadWeb(){
         try {
             buildWebView()
-            webView.loadUrl( buildUrl() )
             webView.loadUrl( this.url )
         }
         catch (e : UnsupportedOperationException){ e.printStackTrace() }
     }

diff --git a/app/src/main/res/.DS_Store b/app/src/main/res/.DS_Store
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
diff --git a/app/src/main/res/mipmap-hdpi/.DS_Store b/app/src/main/res/mipmap-hdpi/.DS_Store
diff --git a/app/src/main/res/mipmap-hdpi/logo.png b/app/src/main/res/mipmap-hdpi/logo.png
diff --git a/app/src/main/res/mipmap-mdpi/.DS_Store b/app/src/main/res/mipmap-mdpi/.DS_Store
diff --git a/app/src/main/res/mipmap-mdpi/logo.png b/app/src/main/res/mipmap-mdpi/logo.png
diff --git a/app/src/main/res/mipmap-xhdpi/.DS_Store b/app/src/main/res/mipmap-xhdpi/.DS_Store
diff --git a/app/src/main/res/mipmap-xhdpi/logo.png b/app/src/main/res/mipmap-xhdpi/logo.png
diff --git a/app/src/main/res/mipmap-xxhdpi/.DS_Store b/app/src/main/res/mipmap-xxhdpi/.DS_Store
diff --git a/app/src/main/res/mipmap-xxhdpi/logo.png b/app/src/main/res/mipmap-xxhdpi/logo.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/.DS_Store b/app/src/main/res/mipmap-xxxhdpi/.DS_Store
diff --git a/app/src/main/res/mipmap-xxxhdpi/logo.png b/app/src/main/res/mipmap-xxxhdpi/logo.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]