Skip to content

Commit

Permalink
Add style viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
@caseydavenport
caseydavenport committed Mar 11, 2016
1 parent 134cd52 commit 123b332
Show file tree
Hide file tree
Showing 20 changed files with 1,221 additions and 43 deletions.
11 changes: 8 additions & 3 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<manifest
package="com.biermacht.brews"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="24"
android:versionName="1.2">
android:versionCode="25"
android:versionName="1.3">

<uses-sdk
android:minSdkVersion="15"
Expand Down Expand Up @@ -38,7 +38,12 @@
android:label="@string/title_activity_display_recipe">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.biermacht.brews.MainActivity"/>
android:value="com.biermacht.brews.frontend.MainActivity"/>
</activity>
<activity
android:name=".frontend.DisplayStyleActivity"
android:configChanges="orientation|screenSize"
android:label="@string/title_activity_display_style">
</activity>
<activity
android:name=".frontend.AddRecipeActivity"
Expand Down
41 changes: 24 additions & 17 deletions res/layout/fragment_profile_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:background="@color/activity_background">
android:background="@color/activity_background"
android:orientation="vertical">

<!-- Divider below pager title -->
<TextView
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_gravity="top"
android:textColor="@color/transparent"
android:background="@color/theme_blue">
android:background="@color/theme_blue"
android:textColor="@color/transparent">
</TextView>

<ScrollView
Expand All @@ -21,25 +21,25 @@

<LinearLayout
android:id="@+id/profile_view"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:padding="10dip"
android:orientation="vertical">
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dip">

<LinearLayout
android:id="@+id/mash_profile_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dip"
android:orientation="vertical"
android:background="@drawable/rounded_bg_white">
android:background="@drawable/rounded_bg_white"
android:orientation="vertical">

<TextView
android:id="@+id/mash_profile_title"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center"
android:background="@drawable/profile_title_bg"
android:gravity="center"
android:text="@string/mash_profile"
android:textColor="@color/title_color"/>

Expand All @@ -50,15 +50,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dip"
android:orientation="vertical"
android:background="@drawable/rounded_bg_white">
android:background="@drawable/rounded_bg_white"
android:orientation="vertical">

<TextView
android:id="@+id/fermentation_profile_title"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center"
android:background="@drawable/profile_title_bg"
android:gravity="center"
android:text="@string/fermentation_profile"
android:textColor="@color/title_color"/>

Expand All @@ -69,27 +69,34 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dip"
android:orientation="vertical"
android:background="@drawable/rounded_bg_white">
android:background="@drawable/rounded_bg_white"
android:orientation="vertical">

<TextView
android:id="@+id/profile_title"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center"
android:background="@drawable/profile_title_bg"
android:gravity="center"
android:text="@string/style_profile"
android:textColor="@color/title_color"/>

<TextView
android:id="@+id/style_profile_name"
android:layout_width="match_parent"
android:layout_height="30dp"
android:gravity="center"
android:background="@color/transparent"
android:gravity="center"
android:text="Other"
android:textColor="@color/text"/>

<Button
android:layout_width="match_parent"
android:layout_height="48dp"
style="@style/button"
android:onClick="displayStyle"
android:text="Details"/>

</LinearLayout>
</LinearLayout>
</ScrollView>
Expand Down
94 changes: 94 additions & 0 deletions res/layout/fragment_style_notes_view.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/activity_background"
android:orientation="vertical">

<!-- Divider below pager title -->
<TextView
android:layout_width="fill_parent"
android:layout_height="1dp"
android:layout_gravity="top"
android:background="@color/theme_blue"
android:textColor="@color/transparent">
</TextView>

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/activity_background">

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical"
android:paddingBottom="32dp">

<TextView
android:id="@+id/category_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Category 10A"
android:textColor="@color/title_color"
android:textSize="24dp"/>

<TextView
android:id="@+id/category_subtitle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="BJCP 2008"/>

<TextView
android:id="@+id/style_notes"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:text="Notes go here and they can be quite long so I'm simulating that with this."
android:textColor="@color/text"
android:textSize="16sp"/>

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:gravity="center"
android:text="Common Ingredients"
android:textColor="@color/title_color"
android:textSize="24dp"/>

<TextView
android:id="@+id/ingredients_view"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="A bunch\nOf beer\n Examples"
android:textColor="@color/text"
android:textSize="16sp"/>

<TextView
android:id="@+id/examples_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:gravity="center"
android:text="Examples"
android:textColor="@color/title_color"
android:textSize="24dp"/>

<TextView
android:id="@+id/examples_view"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="A bunch\nOf beer\n Examples"
android:textColor="@color/text"
android:textSize="16sp"/>

</LinearLayout>

</ScrollView>
</LinearLayout>
Loading

0 comments on commit 123b332

Please sign in to comment.