diff --git a/app/src/main/java/com/aricneto/twistytimer/fragment/dialog/ThemeSelectDialog.java b/app/src/main/java/com/aricneto/twistytimer/fragment/dialog/ThemeSelectDialog.java
index bcf519b1..33efc8ad 100644
--- a/app/src/main/java/com/aricneto/twistytimer/fragment/dialog/ThemeSelectDialog.java
+++ b/app/src/main/java/com/aricneto/twistytimer/fragment/dialog/ThemeSelectDialog.java
@@ -62,12 +62,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
textStyleRecycler.setHasFixedSize(true);
- GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.HORIZONTAL, false);
- LinearLayoutManager layoutManager = new LinearLayoutManager(null);
- layoutManager.setOrientation(RecyclerView.HORIZONTAL);
+ GridLayoutManager themeLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.HORIZONTAL, false);
+ GridLayoutManager textLayoutManager = new GridLayoutManager(mContext, 2, GridLayoutManager.HORIZONTAL, false);
- themeRecycler.setLayoutManager(gridLayoutManager);
- textStyleRecycler.setLayoutManager(layoutManager);
+ themeRecycler.setLayoutManager(themeLayoutManager);
+ textStyleRecycler.setLayoutManager(textLayoutManager);
ThemeListAdapter themeListAdapter = new ThemeListAdapter(ThemeUtils.getAllThemes(), mContext);
TextStyleListAdapter textStyleListAdapter = new TextStyleListAdapter(ThemeUtils.getAllTextStyles(mContext), mContext);
@@ -79,7 +78,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
// Set Text Style selector background
GradientDrawable gradientDrawable = ThemeUtils.fetchBackgroundGradient(mContext, ThemeUtils.getPreferredTheme());
gradientDrawable.setCornerRadii(new float[] {0, 0, 0, 0, cornerRadius, cornerRadius, cornerRadius, cornerRadius});
- gradientDrawable.setStroke(ThemeUtils.dpToPix(mContext, 1), Color.BLACK);
textStyleRecycler.setBackground(gradientDrawable);
diff --git a/app/src/main/java/com/aricneto/twistytimer/utils/ThemeUtils.java b/app/src/main/java/com/aricneto/twistytimer/utils/ThemeUtils.java
index c0c60cc4..42579f34 100644
--- a/app/src/main/java/com/aricneto/twistytimer/utils/ThemeUtils.java
+++ b/app/src/main/java/com/aricneto/twistytimer/utils/ThemeUtils.java
@@ -55,10 +55,20 @@ public final class ThemeUtils {
public static final String TEXT_DEFAULT = "default";
- public static final String TEXT_TARKOVSKY = "tarkovsky";
+ public static final String TEXT_PESSOA = "pessoa";
+ public static final String TEXT_BURGESS = "burgess";
+ public static final String TEXT_LOU = "lou";
+ public static final String TEXT_BOWIE = "bowie";
+ public static final String TEXT_BRIE = "brie";
public static final String TEXT_MATSSON = "matsson";
+ public static final String TEXT_ISAKOV = "isakov";
+ public static final String TEXT_ADAMS = "adams";
+ public static final String TEXT_IRWIN = "irwin";
+ public static final String TEXT_TARKOVSKY = "tarkovsky";
+ public static final String TEXT_EBERT = "ebert";
public static final String TEXT_TOLKIEN = "tolkien";
- public static final String TEXT_PESSOA = "pessoa";
+ public static final String TEXT_ASIMOV = "asimov";
+ public static final String TEXT_KUBRICK = "kubrick";
/**
* Private constructor to prevent instantiation of this utility class.
@@ -134,14 +144,34 @@ public static int getThemeStyleRes(String theme) {
return R.style.SpottyGuy;
case TEXT_DEFAULT:
return getPreferredTheme();
+ case TEXT_PESSOA:
+ return R.style.TextStylePessoa;
+ case TEXT_BURGESS:
+ return R.style.TextStyleBurgess;
+ case TEXT_LOU:
+ return R.style.TextStyleLou;
+ case TEXT_BOWIE:
+ return R.style.TextStyleBowie;
+ case TEXT_BRIE:
+ return R.style.TextStyleBrie;
+ case TEXT_MATSSON:
+ return R.style.TextStyleMatsson;
+ case TEXT_ISAKOV:
+ return R.style.TextStyleIsakov;
+ case TEXT_ADAMS:
+ return R.style.TextStyleAdams;
+ case TEXT_IRWIN:
+ return R.style.TextStyleIrwin;
case TEXT_TARKOVSKY:
return R.style.TextStyleTarkovsky;
+ case TEXT_EBERT:
+ return R.style.TextStyleEbert;
case TEXT_TOLKIEN:
return R.style.TextStyleTolkien;
- case TEXT_MATSSON:
- return R.style.TextStyleMatsson;
- case TEXT_PESSOA:
- return R.style.TextStylePessoa;
+ case TEXT_ASIMOV:
+ return R.style.TextStyleAsimov;
+ case TEXT_KUBRICK:
+ return R.style.TextStyleKubrick;
}
}
@@ -183,10 +213,20 @@ public static Theme[] getAllThemes() {
public static Theme[] getAllTextStyles(Context context) {
Theme[] styles = {
new Theme(TEXT_DEFAULT, context.getString(R.string.action_default)),
+ new Theme(TEXT_PESSOA, "Pessoa"),
+ new Theme(TEXT_LOU, "Lou"),
+ new Theme(TEXT_BURGESS, "Burgess"),
+ new Theme(TEXT_BOWIE, "Bowie"),
+ new Theme(TEXT_BRIE, "Brie"),
+ new Theme(TEXT_MATSSON, "Matsson"),
+ new Theme(TEXT_ISAKOV, "Isakov"),
+ new Theme(TEXT_ADAMS, "Adams"),
+ new Theme(TEXT_IRWIN, "Irwin"),
new Theme(TEXT_TARKOVSKY, "Tarkovsky"),
+ new Theme(TEXT_EBERT, "Ebert"),
new Theme(TEXT_TOLKIEN, "Tolkien"),
- new Theme(TEXT_MATSSON, "Matsson"),
- new Theme(TEXT_PESSOA, "Pessoa")
+ new Theme(TEXT_ASIMOV, "Asimov"),
+ new Theme(TEXT_KUBRICK, "Kubrick"),
};
return styles;
}
diff --git a/app/src/main/res/drawable/background_card_noborder.xml b/app/src/main/res/drawable/background_card_noborder.xml
new file mode 100644
index 00000000..e9da3497
--- /dev/null
+++ b/app/src/main/res/drawable/background_card_noborder.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_theme_select.xml b/app/src/main/res/layout/dialog_theme_select.xml
index 95644912..625c5c88 100644
--- a/app/src/main/res/layout/dialog_theme_select.xml
+++ b/app/src/main/res/layout/dialog_theme_select.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/outline_background_card"
+ android:background="@drawable/background_card_noborder"
android:orientation="vertical">
@@ -39,8 +38,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/list"
- android:layout_marginLeft="1dp"
- android:layout_marginRight="1dp"
android:background="?colorCardBackgroundFaded"
android:textStyle="bold"
android:paddingTop="8dp"
@@ -53,8 +50,6 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/text_style_title"
- android:layout_marginLeft="1dp"
- android:layout_marginRight="1dp"
android:layout_marginBottom="0dp"
android:background="@color/black_divider"
android:visibility="gone"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c91bdbf4..e2dd8189 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -458,20 +458,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-