Skip to content

Commit

Permalink
java to kotlin conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
Aroniez committed May 31, 2019
1 parent fcaec04 commit 38db311
Show file tree
Hide file tree
Showing 55 changed files with 1,059 additions and 1,185 deletions.
11 changes: 8 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 28
defaultConfig {
Expand Down Expand Up @@ -43,7 +45,10 @@ android {
ext {
arch_version = '1.1.1'
support_lib_version = '28.0.0'
dagger_version = '2.14.1'
dagger_version = '2.15'
}
kapt {
generateStubs = true
}


Expand Down Expand Up @@ -91,8 +96,8 @@ dependencies {
implementation "com.google.dagger:dagger:$dagger_version"
implementation "com.google.dagger:dagger-android:$dagger_version"
implementation "com.google.dagger:dagger-android-support:$dagger_version"
annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
kapt "com.google.dagger:dagger-compiler:$dagger_version"

implementation 'com.squareup.retrofit2:retrofit:2.3.0'

Expand Down
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?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="me.gilo.wc">

<uses-permission android:name="android.permission.INTERNET"/>
Expand All @@ -12,7 +13,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".ui.order.OrderActivity"
android:label="@string/title_activity_order"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/gilo/wc/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
public class Config {
public static String currencySymbol = "Ksh.";

public static String siteUrl = "http://192.168.100.61/shop/index.php";
public static String consumerKey = "ck_da34628a4a69128001876492b842be4cd3c76bf8";
public static String consumerSecret = "cs_c3c70248288a60bc21a0cddc81acdc018df1632d";
public static String siteUrl = "http://aklin.ir/wp";
public static String consumerKey = "ck_c559b86adc5460395e3ae483b852201615d29712";
public static String consumerSecret = "cs_5aaa22e54cd35fd42e490ab12c22afb4d99b6225";

}
15 changes: 2 additions & 13 deletions app/src/main/java/me/gilo/wc/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,20 @@ import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import com.google.firebase.auth.FirebaseAuth
import me.gilo.raison.ui.user.onboarding.SignInActivity
import me.gilo.raison.ui.user.onboarding.SignUpActivity
import me.gilo.wc.ui.customer.BasicCustomerDetailsActivity
import me.gilo.wc.ui.customer.BillingAddressActivity
import me.gilo.wc.ui.customer.ShippingAddressActivity
import me.gilo.wc.ui.home.HomeActivity
import me.gilo.wc.ui.onboarding.AnonymousSignInActivity
import me.gilo.wc.ui.order.MyOrdersActivity
import me.gilo.wc.ui.product.ProductActivity

class MainActivity : AppCompatActivity() {

val TAG = "MainActivity";

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)


if(FirebaseAuth.getInstance().currentUser != null) {
if (FirebaseAuth.getInstance().currentUser != null) {
startActivity(Intent(baseContext, MyOrdersActivity::class.java))
}else{
} else {
startActivity(Intent(baseContext, AnonymousSignInActivity::class.java))
}

finish()

}
Expand Down
32 changes: 0 additions & 32 deletions app/src/main/java/me/gilo/wc/WcApp.java

This file was deleted.

35 changes: 35 additions & 0 deletions app/src/main/java/me/gilo/wc/WcApp.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package me.gilo.wc

import android.app.Application
import dagger.android.AndroidInjector
import dagger.android.DaggerApplication
import io.github.inflationx.calligraphy3.CalligraphyConfig
import io.github.inflationx.calligraphy3.CalligraphyInterceptor
import io.github.inflationx.viewpump.ViewPump
import me.gilo.wc.di.DaggerAppComponent

class WcApp : DaggerApplication() {

override fun onCreate() {
super.onCreate()

ViewPump.init(
ViewPump.builder()
.addInterceptor(
CalligraphyInterceptor(
CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/GT-America-Regular.otf")
.setFontAttrId(R.attr.fontPath)
.build()
)
)
.build()
)


}

override fun applicationInjector(): AndroidInjector<out DaggerApplication> {
return DaggerAppComponent.create()
}
}
37 changes: 0 additions & 37 deletions app/src/main/java/me/gilo/wc/adapter/CartAdapter.java

This file was deleted.

30 changes: 30 additions & 0 deletions app/src/main/java/me/gilo/wc/adapter/CartAdapter.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package me.gilo.wc.adapter

import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.wc.R
import me.gilo.wc.adapter.viewholder.CartViewHolder
import me.gilo.wc.adapter.viewholder.CategoryViewHolder
import me.gilo.wc.models.CartLineItem
import me.gilo.woodroid.models.CartItem
import me.gilo.woodroid.models.Category

class CartAdapter(private val cartLineItems: List<CartLineItem>) : RecyclerView.Adapter<CartViewHolder>() {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CartViewHolder {
return CartViewHolder(
parent.context,
LayoutInflater.from(parent.context).inflate(R.layout.single_cart_item, parent, false)
)
}

override fun onBindViewHolder(holder: CartViewHolder, position: Int) {
holder.renderView(cartLineItems[position])
}


override fun getItemCount(): Int {
return if (cartLineItems.isEmpty()) 0 else cartLineItems.size
}
}
34 changes: 0 additions & 34 deletions app/src/main/java/me/gilo/wc/adapter/CategoryAdapter.java

This file was deleted.

27 changes: 27 additions & 0 deletions app/src/main/java/me/gilo/wc/adapter/CategoryAdapter.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package me.gilo.wc.adapter

import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.wc.R
import me.gilo.wc.adapter.viewholder.CategoryViewHolder
import me.gilo.woodroid.models.Category

class CategoryAdapter(private val categories: List<Category>) : RecyclerView.Adapter<CategoryViewHolder>() {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CategoryViewHolder {
return CategoryViewHolder(
parent.context,
LayoutInflater.from(parent.context).inflate(R.layout.single_category_item, parent, false)
)
}

override fun onBindViewHolder(holder: CategoryViewHolder, position: Int) {
holder.renderView(categories[position])
}


override fun getItemCount(): Int {
return if (categories.isEmpty()) 0 else categories.size
}
}
34 changes: 0 additions & 34 deletions app/src/main/java/me/gilo/wc/adapter/CouponAdapter.java

This file was deleted.

27 changes: 27 additions & 0 deletions app/src/main/java/me/gilo/wc/adapter/CouponAdapter.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package me.gilo.wc.adapter

import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import me.gilo.wc.R
import me.gilo.wc.adapter.viewholder.CouponViewHolder
import me.gilo.woodroid.models.Coupon

class CouponAdapter(private val coupons: List<Coupon>) : RecyclerView.Adapter<CouponViewHolder>() {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CouponViewHolder {
return CouponViewHolder(
parent.context,
LayoutInflater.from(parent.context).inflate(R.layout.single_coupon_item, parent, false)
)
}

override fun onBindViewHolder(holder: CouponViewHolder, position: Int) {
holder.renderView(coupons[position])
}


override fun getItemCount(): Int {
return if (coupons.size == 0) 0 else coupons.size
}
}
34 changes: 0 additions & 34 deletions app/src/main/java/me/gilo/wc/adapter/HomeProductAdapter.java

This file was deleted.

Loading

0 comments on commit 38db311

Please sign in to comment.