Renamed layout

yuyakaido · yuyakaido · commit edb4d5f78165 · 2017-08-13T04:57:20.000+09:00
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/CardStackView.java
@@ -120,7 +120,7 @@ private void initializeViews() {
 
         for (int i = 0; i < option.visibleCount; i++) {
             CardContainerView view = (CardContainerView) LayoutInflater.from(getContext())
-                    .inflate(R.layout.card_container_view, this, false);
+                    .inflate(R.layout.card_container, this, false);
             view.setDraggable(false);
             view.setCardStackOption(option);
             view.setOverlay(option.leftOverlay, option.rightOverlay);
diff --git a/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardContainerView.java b/cardstackview/src/main/java/com/yuyakaido/android/cardstackview/internal/CardContainerView.java
@@ -67,9 +67,9 @@ public CardContainerView(Context context, AttributeSet attrs, int defStyleAttr)
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-        inflate(getContext(), R.layout.view_card, this);
-        contentContainer = (ViewGroup) findViewById(R.id.view_card_container_content);
-        overlayContainer = (ViewGroup) findViewById(R.id.view_card_container_overlay);
+        inflate(getContext(), R.layout.card_frame, this);
+        contentContainer = (ViewGroup) findViewById(R.id.card_frame_content_container);
+        overlayContainer = (ViewGroup) findViewById(R.id.card_frame_overlay_container);
     }
 
     @Override
diff --git a/cardstackview/src/main/res/layout/card_container.xml b/cardstackview/src/main/res/layout/card_container.xml
diff --git a/cardstackview/src/main/res/layout/card_frame.xml b/cardstackview/src/main/res/layout/card_frame.xml
@@ -6,13 +6,13 @@
     android:layout_height="match_parent">
 
     <FrameLayout
-        android:id="@+id/view_card_container_content"
+        android:id="@+id/card_frame_content_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     </FrameLayout>
 
     <FrameLayout
-        android:id="@+id/view_card_container_overlay"
+        android:id="@+id/card_frame_overlay_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
     </FrameLayout>
diff --git a/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/TouristSpotCardAdapter.java b/sample/src/main/java/com/yuyakaido/android/cardstackview/sample/TouristSpotCardAdapter.java
@@ -22,7 +22,7 @@ public View getView(int position, View contentView, ViewGroup parent) {
 
         if (contentView == null) {
             LayoutInflater inflater = LayoutInflater.from(getContext());
-            contentView = inflater.inflate(R.layout.item_card_stack, parent, false);
+            contentView = inflater.inflate(R.layout.item_tourist_spot_card, parent, false);
             holder = new ViewHolder(contentView);
             contentView.setTag(holder);
         } else {
@@ -44,9 +44,9 @@ private static class ViewHolder {
         public ImageView image;
 
         public ViewHolder(View view) {
-            this.name = (TextView) view.findViewById(R.id.item_card_stack_name);
-            this.city = (TextView) view.findViewById(R.id.item_card_stack_city);
-            this.image = (ImageView) view.findViewById(R.id.item_card_stack_image);
+            this.name = (TextView) view.findViewById(R.id.item_tourist_spot_card_name);
+            this.city = (TextView) view.findViewById(R.id.item_tourist_spot_card_city);
+            this.image = (ImageView) view.findViewById(R.id.item_tourist_spot_card_image);
         }
     }
 
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
@@ -20,8 +20,8 @@
         app:elevationEnabled="true"
         app:swipeEnabled="true"
         app:swipeDirection="horizontal"
-        app:leftOverlay="@layout/view_overlay_left"
-        app:rightOverlay="@layout/view_overlay_right"/>
+        app:leftOverlay="@layout/overlay_left"
+        app:rightOverlay="@layout/overlay_right"/>
 
     <ProgressBar
         android:id="@+id/activity_main_progress_bar"
diff --git a/sample/src/main/res/layout/item_tourist_spot_card.xml b/sample/src/main/res/layout/item_tourist_spot_card.xml
@@ -15,7 +15,7 @@
         android:layout_height="match_parent">
 
         <ImageView
-            android:id="@+id/item_card_stack_image"
+            android:id="@+id/item_tourist_spot_card_image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"/>
@@ -29,15 +29,15 @@
             android:layout_alignParentBottom="true">
 
             <TextView
-                android:id="@+id/item_card_stack_name"
+                android:id="@+id/item_tourist_spot_card_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textStyle="bold"
                 android:textColor="@android:color/white"
                 android:textSize="26sp"/>
 
             <TextView
-                android:id="@+id/item_card_stack_city"
+                android:id="@+id/item_tourist_spot_card_city"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textStyle="bold"
diff --git a/sample/src/main/res/layout/overlay_left.xml b/sample/src/main/res/layout/overlay_left.xml
@@ -14,6 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@mipmap/icon_overlay_left"/>
+        android:src="@mipmap/overlay_left"/>
 
 </android.support.v7.widget.CardView>
diff --git a/sample/src/main/res/layout/overlay_right.xml b/sample/src/main/res/layout/overlay_right.xml
@@ -14,6 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@mipmap/icon_overlay_right"/>
+        android:src="@mipmap/overlay_right"/>
 
 </android.support.v7.widget.CardView>
diff --git a/sample/src/main/res/mipmap-xxhdpi/overlay_left.png b/sample/src/main/res/mipmap-xxhdpi/overlay_left.png
diff --git a/sample/src/main/res/mipmap-xxhdpi/overlay_right.png b/sample/src/main/res/mipmap-xxhdpi/overlay_right.png
