Fixed view_tabs loading, text correction issues

ckdevrel · Aug 23, 2017 · 44fbe71 · 44fbe71
1 parent a687464
commit 44fbe71
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/recipe.xml.ftl b/recipe.xml.ftl
@@ -81,13  81,16 @@
                       to="${escapeXmlAttribute(srcOut)}/${tabName3}.java" />
 
     <instantiate from="res/layout/fragment_first.xml.ftl"
-            to="${escapeXmlAttribute(resOut)}/layout/${tabLayoutName1}.xml" />
                       to="${escapeXmlAttribute(resOut)}/layout/${tabLayoutName1}.xml" />
 
     <instantiate from="res/layout/fragment_second.xml.ftl"
-                    to="${escapeXmlAttribute(resOut)}/layout/${tabLayoutName2}.xml" />
                       to="${escapeXmlAttribute(resOut)}/layout/${tabLayoutName2}.xml" />
 
     <instantiate from="res/layout/fragment_third.xml.ftl"
-                            to="${escapeXmlAttribute(resOut)}/layout/${tabLayoutName3}.xml" />
                       to="${escapeXmlAttribute(resOut)}/layout/${tabLayoutName3}.xml" />
 
     <instantiate from="res/layout/view_tabs.xml.ftl"
                       to="${escapeXmlAttribute(resOut)}/layout/view_tabs.xml" />
 
 
 </recipe>
diff --git a/root/res/layout/view_tabs_xml.ftl → root/res/layout/view_tabs.xml.ftl b/root/res/layout/view_tabs_xml.ftl → root/res/layout/view_tabs.xml.ftl
@@ -5,11  5,27 @@
     android:layout_height="wrap_content"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="16dp">
     android:padding="5dp">
 
     <#if tabstyle == 'icons' || tabstyle == 'iconswithtext'>
 
     <ImageView
         android:id="@ id/tab_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
     </#if>
 
     <#if tabstyle == 'simple'|| tabstyle == 'iconswithtext'>
 
 
     <TextView
           android:id="@ id/tab_text"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:textColor="@android:color/white"
           android:textSize="16sp"
           android:textAllCaps="true" />
 
     </#if>
 </LinearLayout>
diff --git a/root/src/app_package/TabsActivity.java.ftl b/root/src/app_package/TabsActivity.java.ftl
@@ -5,7  5,7 @@ import ${applicationPackage}.R;
 </#if>
 
 <#if tabposition == 'bottom'>
-    <#include "include_botttom_tab_activity.java.ftl"/>
     <#include "include_bottom_tab_activity.java.ftl"/>
 <#else>
     <#include "include_top_tab_activity.java.ftl"/>
 </#if>
diff --git a/root/src/app_package/include_bottom_tab_activity.java.ftl b/root/src/app_package/include_bottom_tab_activity.java.ftl
@@ -4,13  4,19 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
 import java.util.ArrayList;
 import java.util.List;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.LayoutInflater;
 import android.widget.TextView;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
 
 
@@ -21,7  27,6 @@ public class ${activityClass} extends AppCompatActivity {
   </#if>
 
   private TabLayout tablayout;
-  private ViewPager viewpager;
 
     private String tabNames[] = {"${tab1}","${tab2}","${tab3}"};
 
@@ -48,6  53,8 @@ public class ${activityClass} extends AppCompatActivity {
 
         setupTabLayout();
 
         initTab();
 
     }
 
     private void setupTabLayout() {
@@ -94,7  101,6 @@ public class ${activityClass} extends AppCompatActivity {
           toolbar = (Toolbar) findViewById(R.id.toolbar);
       </#if>
           tablayout = (TabLayout) findViewById(R.id.tablayout);
-          viewpager = (ViewPager) findViewById(R.id.viewpager);
       }
 
     <#if isToolbar>
@@ -119,7  125,7 @@ public class ${activityClass} extends AppCompatActivity {
 
 
        private View getTabView(int position) {
-           View view = LayoutInflater.from(MainActivity.this).inflate(R.layout.view_tab, null);
            View view = LayoutInflater.from(MainActivity.this).inflate(R.layout.view_tabs, null);
 
            <#if tabstyle == 'icons' || tabstyle == 'iconswithtext'>
            ImageView icon = (ImageView) view.findViewById(R.id.tab_icon);