Merge pull request #70 from CalyFactory/dev

v1.0.9 release
CalyFactory · Jun 17, 2017 · daac046 · daac046
2 parents 81f1b73 + adeb7c3
commit daac046
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,7 @@
-# caly-android ![travis](https://travis-ci.org/CalyFactory/caly-android.svg?branch=dev-jspiner)
+# caly-android 
+![travis](https://travis-ci.org/CalyFactory/caly-android.svg?branch=dev-jspiner)
+![release](https://img.shields.io/github/release/calyfactory/caly-android/all.svg)
+![contributor](https://img.shields.io/github/contributors/calyfactory/caly-android.svg)
 android caly application
+
+you can download CALY in [here](http://bit.ly/calyapp)
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "io.caly.calyandroid"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 9
-        versionName "1.0.8"
+        versionCode 10
+        versionName "1.0.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

diff --git a/app/src/main/java/io/caly/calyandroid/adapter/RecoMapListAdapter.java b/app/src/main/java/io/caly/calyandroid/adapter/RecoMapListAdapter.java
@@ -80,6 +80,12 @@ public class ViewHolder{
         @Bind(R.id.imv_reco_share)
         ImageView imvShare;
 
+        @Bind(R.id.tv_reco_price)
+        TextView tvRecoPrice;
+
+        @Bind(R.id.tv_reco_insta)
+        TextView tvInsta;
+
 
         public ViewHolder(View view){
             ButterKnife.bind(this, view);
@@ -112,7 +118,12 @@ void bindView(ViewHolder holder, final int position){
         holder.tvRecoTitle.setText(recoModel.title);
         holder.tvRecoDistance.setText(recoModel.distance);
         holder.tvRecoHashtag.setText(StringFormmater.hashTagFormat(recoModel.tagNames));
-
+        holder.tvInsta.setText(recoModel.sourceUserId);
+        holder.tvRecoPrice.setText(
+                StringFormmater.priceFormat(
+                        recoModel.price
+                )
+        );
         Picasso.with(context)
                 .load(context.getString(R.string.app_server) + "img/" + recoModel.imgUrl)
                 .error(R.drawable.img_not_found)

diff --git a/app/src/main/java/io/caly/calyandroid/adapter/RecommendListAdapter.java b/app/src/main/java/io/caly/calyandroid/adapter/RecommendListAdapter.java
@@ -84,6 +84,9 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
         @Bind(R.id.imv_reco_share)
         ImageView imvShare;
 
+        @Bind(R.id.tv_reco_price)
+        TextView tvRecoPrice;
+
         /*
         @Bind(R.id.imv_reco_more)
         ImageView imvRecoMore;
@@ -137,6 +140,11 @@ public void onBindViewHolder(ViewHolder holder, final int position) {
         holder.tvRecoDistance.setText(recoModel.distance);
         holder.tvRecoHashtag.setText(StringFormmater.hashTagFormat(recoModel.tagNames));
         holder.tvInsta.setText(recoModel.sourceUserId);
+        holder.tvRecoPrice.setText(
+                StringFormmater.priceFormat(
+                        recoModel.price
+                )
+        );
 
         Picasso.with(context)
                 .load(context.getString(R.string.app_server) + "img/" + recoModel.imgUrl)

diff --git a/app/src/main/java/io/caly/calyandroid/fragment/RecoListFragment.java b/app/src/main/java/io/caly/calyandroid/fragment/RecoListFragment.java
@@ -104,9 +104,9 @@ void init(){
         Logger.d(TAG, "init ");
 
         //init tab layout
-        tabLayout.addTab(tabLayout.newTab().setText("식당"));
+        tabLayout.addTab(tabLayout.newTab().setText("레스토랑"));
         tabLayout.addTab(tabLayout.newTab().setText("카페"));
-        tabLayout.addTab(tabLayout.newTab().setText("액티비티"));
+        tabLayout.addTab(tabLayout.newTab().setText("플레이스"));
 
 
         pagerAdapter = new RecoTabPagerAdapter(getFragmentManager(), eventData);
@@ -202,13 +202,13 @@ public void recoListScrollEventCallback(RecoListScrollEvent event){
     public void recoListLoadDoneEvent(RecoListLoadStateChangeEvent doneEvent){
         switch (doneEvent.category){
             case RESTAURANT:
-                tabLayout.getTabAt(0).setText("식당("+doneEvent.dataCount+")");
+                tabLayout.getTabAt(0).setText("레스토랑("+doneEvent.dataCount+")");
                 break;
             case CAFE:
                 tabLayout.getTabAt(1).setText("카페("+doneEvent.dataCount+")");
                 break;
             case PLACE:
-                tabLayout.getTabAt(2).setText("액티비티("+doneEvent.dataCount+")");
+                tabLayout.getTabAt(2).setText("플레이스("+doneEvent.dataCount+")");
                 break;
         }
     }

diff --git a/app/src/main/java/io/caly/calyandroid/util/StringFormmater.java b/app/src/main/java/io/caly/calyandroid/util/StringFormmater.java
@@ -90,6 +90,13 @@ public static String simpleDateFormat(Date date){
 
     }
 
+    public static String priceFormat(int price){
+        return String.format(
+                "%d원 이상",
+                price
+        );
+    }
+
     public static String hashTagFormat(String hashtags){
         if(hashtags==null){
             return "";

diff --git a/app/src/main/res/layout/fragment_recomap.xml b/app/src/main/res/layout/fragment_recomap.xml
@@ -54,8 +54,14 @@
             android:layout_marginBottom="260dp"
             android:orientation="vertical"
             android:gravity="bottom"
+            android:paddingTop="7dp"
+            android:paddingLeft="6dp"
+            android:paddingBottom="5dp"
+            android:paddingRight="8dp"
+            android:layout_gravity="bottom"
+            android:background="@color/white"
             android:layout_marginLeft="27dp"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <LinearLayout
                 android:id="@+id/linear_map_category_1"

diff --git a/app/src/main/res/layout/item_reco_mapitem.xml b/app/src/main/res/layout/item_reco_mapitem.xml
@@ -37,17 +37,61 @@
 
                     <View
                         android:layout_width="match_parent"
-                        android:background="#26b6755d"
+                        android:background="#2e51362c"
                         android:layout_height="match_parent"/>
 
                     <ImageView
-                        android:layout_marginTop="14dp"
-                        android:layout_marginRight="19dp"
+                        android:layout_marginTop="12dp"
+                        android:layout_marginRight="15dp"
                         android:layout_gravity="right"
-                        android:layout_width="18dp"
+                        android:layout_width="28dp"
                         android:id="@+id/imv_reco_share"
                         android:src="@drawable/ic_share_white_48dp"
-                        android:layout_height="21dp" />
+                        android:layout_height="28dp" />
+
+                    <LinearLayout
+                        android:layout_gravity="bottom"
+                        android:layout_width="match_parent"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginLeft="16dp"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal"
+                        android:layout_height="wrap_content">
+
+                        <ImageView
+                            android:src="@drawable/instagram"
+                            android:layout_width="14dp"
+                            android:layout_height="13dp" />
+
+                        <TextView
+                            android:layout_marginLeft="5dp"
+                            android:layout_width="wrap_content"
+                            android:text="JSpiner"
+                            android:textColor="@color/white"
+                            android:textSize="11dp"
+                            android:id="@+id/tv_reco_insta"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="15dp"
+                        android:layout_gravity="bottom|right"
+                        android:layout_height="wrap_content">
+
+                        <TextView
+                            android:layout_marginLeft="5dp"
+                            android:layout_width="wrap_content"
+                            android:text="1인당 가격 : 5000원"
+                            android:textColor="@color/white"
+                            android:textSize="14dp"
+                            android:id="@+id/tv_reco_price"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
 
                 </FrameLayout>
 

diff --git a/app/src/main/res/layout/item_recolist_row.xml b/app/src/main/res/layout/item_recolist_row.xml
@@ -40,7 +40,7 @@
 
                     <View
                         android:layout_width="match_parent"
-                        android:background="#26b6755d"
+                        android:background="#2e51362c"
                         android:layout_height="match_parent"/>
 
                     <ImageView
@@ -76,6 +76,25 @@
                             android:layout_height="wrap_content" />
 
                     </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginRight="15dp"
+                        android:layout_gravity="bottom|right"
+                        android:layout_height="wrap_content">
+
+                        <TextView
+                            android:layout_marginLeft="5dp"
+                            android:layout_width="wrap_content"
+                            android:text="1인당 가격 : 5000원"
+                            android:textColor="@color/white"
+                            android:textSize="14dp"
+                            android:id="@+id/tv_reco_price"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
                 </FrameLayout>
 
                 <LinearLayout