Fix custom layout

javiersantos · Apr 14, 2017 · 71e6140 · 71e6140
1 parent 1b9e011
commit 71e6140
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 44 deletions.
diff --git a/app/src/main/res/layout/custom_license_layout.xml b/app/src/main/res/layout/custom_license_layout.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center">
+
+ <ImageView
+ android:layout_width="42dp"
+ android:layout_height="42dp"
+ android:src="@mipmap/ic_launcher" />
+
+</LinearLayout>
diff --git a/library/src/main/java/com/github/javiersantos/piracychecker/activities/LicenseActivity.java b/library/src/main/java/com/github/javiersantos/piracychecker/activities/LicenseActivity.java
@@ -7,6 +7,9 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 
 import com.github.javiersantos.piracychecker.R;
@@ -21,8 +24,8 @@ public class LicenseActivity extends AppCompatActivity {
  @Override
  protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_license);
  getIntentData();
- setContentView(layoutXML != -1 ? layoutXML : R.layout.activity_license);
  setActivityStyle();
  setActivityData();
  }
@@ -58,8 +61,18 @@ private void setActivityStyle() {
  }
 
  private void setActivityData() {
- TextView activityDescription = (TextView) findViewById(R.id.piracy_checker_description);
- activityDescription.setText(description);
+ FrameLayout frameLayout = (FrameLayout) findViewById(R.id.mainContainer);
+
+ LayoutInflater factory = LayoutInflater.from(this);
+ View inflateView;
+ if (layoutXML == -1) {
+ inflateView = factory.inflate(R.layout.activity_license_default, null);
+ TextView activityDescription = (TextView) inflateView.findViewById(R.id.piracy_checker_description);
+ activityDescription.setText(description);
+ } else
+ inflateView = factory.inflate(layoutXML, null);
+
+ frameLayout.addView(inflateView);
  }
 
 }
diff --git a/library/src/main/res/layout/activity_license.xml b/library/src/main/res/layout/activity_license.xml
@@ -1,48 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:orientation="vertical">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
 
  <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- android:elevation="4dp"
- app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="20dp"
- android:gravity="center">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:text="@string/app_unlicensed"
- android:textSize="16sp"
- android:textStyle="bold"
- android:textColor="?android:attr/textColorPrimary"
- android:lines="2"
- android:gravity="center"/>
-
- <TextView
- android:id="@+id/piracy_checker_description"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/app_unlicensed_description"
- android:textColor="?android:attr/textColorPrimary"
- android:lines="2"
- android:gravity="center"/>
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
- </LinearLayout>
+ <FrameLayout
+ android:id="@+id/mainContainer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
 
 </LinearLayout>
diff --git a/library/src/main/res/layout/activity_license_default.xml b/library/src/main/res/layout/activity_license_default.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="20dp"
+ android:gravity="center">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="@string/app_unlicensed"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:textColor="?android:attr/textColorPrimary"
+ android:lines="2"
+ android:gravity="center"/>
+
+ <TextView
+ android:id="@+id/piracy_checker_description"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/app_unlicensed_description"
+ android:textColor="?android:attr/textColorPrimary"
+ android:lines="2"
+ android:gravity="center"/>
+
+</LinearLayout>