Skip to content

Commit

Permalink
Added the inventory screen. (Fixed #6)
Browse files Browse the repository at this point in the history
  • Loading branch information
JayTSmith committed Oct 31, 2017
1 parent fb83b25 commit 8d3db15
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class CharacterSheetFragment extends Fragment
Button mTotalPowerButton;
Button mCurrentPowerButton;

Button mSaveButton;
Button mInventoryButton;

public CharacterSheetFragment(){
mPortfolio = Portfolio.get();
Expand Down Expand Up @@ -288,8 +288,8 @@ public void onClick(View view) {
}
});

mSaveButton = (Button) rootView.findViewById(R.id.save_button);
mSaveButton.setOnClickListener(new View.OnClickListener() {
mInventoryButton = (Button) rootView.findViewById(R.id.inventory_button);
mInventoryButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
getFragmentManager().beginTransaction()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,11 @@
android:textAlignment="center"
android:textSize="24sp"/>
</TableRow>
<TableRow>
<Button android:id="@+id/save_button"
android:text="SAVE SINET"/>
</TableRow>
<!--TODO: Remove this comment. -->
<!-- TableRow -->
<!-- Button android:id="@+id/save_button"
android:text="SAVE SINET"/ -->
<!-- /TableRow -->
</TableLayout>

<TextView
Expand Down Expand Up @@ -638,6 +639,25 @@
android:visibility="gone"/>
</TableRow>
</TableLayout>

<TextView
android:id="@+id/inventory_title_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/character_sheet_box_black"
android:text="@string/inventory"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="24sp"/>

<Button
android:id="@+id/inventory_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/inventory_btn"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textSize="24sp"/>
</LinearLayout>
</ScrollView>
</LinearLayout>
2 changes: 2 additions & 0 deletions MazesAndMinotaurs/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,6 @@
<string name="reset_equipment">Reset Equipment Database</string>
<string name="caution_alert">Are you sure?</string>
<string name="reset_equip_msg">This will reset the EquipmentDB to default values and delete the saved file!</string>
<string name="inventory">Inventory</string>
<string name="inventory_btn">Open Inventory</string>
</resources>
2 changes: 1 addition & 1 deletion MazesAndMinotaurs/instapk.log
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Oct 30, 2017 11:56:23 AM com.pytenlabs.instapk.helpers.LogHelper init
Oct 31, 2017 10:59:06 AM com.pytenlabs.instapk.helpers.LogHelper init
INFO: Linux, 4.9.0-3-amd64, amd64, Android Studio AI-162.2228.14

0 comments on commit 8d3db15

Please sign in to comment.