Finalized everything except integrated language switching.

This commit is contained in:
Gabriel Tofvesson 2016-02-26 10:13:59 +01:00
parent 82270d7c95
commit 4cefb220cf
11 changed files with 74 additions and 11 deletions

View File

@ -1,7 +0,0 @@
<component name="ProjectDictionaryState">
<dictionary name="Gabriel">
<words>
<w>tofvesson</w>
</words>
</dictionary>
</component>

2
.idea/gradle.xml generated
View File

@ -5,7 +5,7 @@
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="E:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio2\gradle\gradle-2.8" />
<option name="gradleJvm" value="1.7" />
<option name="modules">
<set>

Binary file not shown.

BIN
Buddhismen.zip Normal file

Binary file not shown.

BIN
app-release.apk Normal file

Binary file not shown.

BIN
app/app-release.apk Normal file

Binary file not shown.

View File

@ -174,7 +174,12 @@ public class MainActivity extends AppCompatActivity
private void loadCorrespondingView(int id){
((RelativeLayout) findViewById(R.id.main_parent)).removeAllViewsInLayout();
RelativeLayout v = (RelativeLayout) getLayoutInflater().inflate(R.layout.dynamic_answer, ((RelativeLayout) findViewById(R.id.main_parent)));
if (id == R.id.nav_question1) {
if(id == R.id.nav_home){
LayoutInflater l = getLayoutInflater();
View v1 = l.inflate(R.layout.dynamic_welcome, (RelativeLayout) findViewById(R.id.main_parent));
v1.findViewById(R.id.arrow).startAnimation(AnimationUtils.loadAnimation(getApplicationContext(), R.anim.arrow_anim));
viewStage = 1;
}else if (id == R.id.nav_question1) {
viewStage=2;
((TextView) v.findViewById(R.id.question)).setText(getResources().getText(R.string.question1));
((TextView) v.findViewById(R.id.answer)).setText(getResources().getText(R.string.answer1));

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:textSize="20sp"
android:text="Restart Tutorial"
android:id="@+id/dyn_text"/>

View File

@ -4,7 +4,7 @@
<string name="navigation_drawer_close">Stäng navigationsfältet</string>
<string name="navigation_drawer_open">Öppna navigationsfältet</string>
<string name="signoff">Från Gabriel Tofvesson</string>
<string name="welcome1">Hej!\nDenna applikation skapades med syfte att att ge svar på tre frågor angående Buddhism som ställts av Helena Sontag till mig och min klass som en examination.</string>
<string name="welcome1">Hej!\nDenna applikation skapades med syfte att ge svar på tre frågor angående Buddhism som ställts av Helena Sontag till mig och min klass som en examination.</string>
<string name="welcome2">Dra med fingret från vänster sida av skärmen mot den högra eller tryck på den befintliga ikonen för att öppna navigationsfältet. Tryck sedan på det svar du vill läsa.</string>
<string name="question1">Gör en reflekterande jämförelse mellan hinduismen och buddhismen, vilka likheter och skillnader finns det?</string>
<string name="question2">Hur uppnår man Nirvana enligt buddhismen, kan uppfattningen variera mellan de olika buddhistiska inriktningarna? </string>
@ -19,4 +19,8 @@
<string name="lang_sv">Svenska</string>
<string name="introduction">Introduktion</string>
<string name="welcome">Välkommen</string>
<string name="label_q1">Fråga 1</string>
<string name="label_q2">Fråga 2</string>
<string name="label_q3">Fråga 3</string>
<string name="label_home">Hem</string>
</resources>

View File

@ -9,7 +9,7 @@
<string name="question1">Reflect upon the apsects of both Buddhism and Hiduism and make a comparison between them. What are their similarities and what are their differences?</string>
<string name="question2">How does one achieve Nirvana according to Buddhism? Do these beliefs vary based on which subset of Buddhism one believes in?</string>
<string name="question3">According to Buddha, peoples thirst for life makes life torturous. What does he mean by that and what, in that case, is true joy?</string>
<string name="answer1">Buddhism was founded roughly around the year 500 BCE I what is now called Nepal. The religion is said to be founded by Gautama Buddha. The religion proposes many ideologies on how a person should live their life such as Karma and Nirvana. Karma is in this case a sum of all of the things that you have done, said or in some form taken part in, while Nirvana is an abstract state wherein the user is freed from their humanity; they reach a higher state of mind allowing them to escape the use of things such as egoism or a thirst for life. Nirvana means “blown out” like a candle but could also mean “extinguished” as it is determined to be a state where a human isnt reborn in the enlightened persons stead. As with Buddhism, Hinduism offers some similar aspects in its religion. Some examples of these are once again Karma as well as Moksha which have a similar and corresponding functions to the earlier ones described i.e. Karma is a sum of all the events you have taken part in and Moksha is a state of having escaped the pseudo-infinite re-birth cycle by the name of Samsara. Hinduism was created (very) roughly around 1900 BCE and considering its geographic proximity to India, it is not unlikely that some of the influences of Buddhism in its early stages came from Hinduism, whose origins are pinpointed to the general Indian region. This also means that ancient tribes from the Himalayas migrating to India in circa 2000 BCE also could have brought the earliest versions of pre-Buddhism that could have influenced the creation of Hinduism which later in-turn influenced Buddhism. On one hand, these religions seem so intertwined both historically and geographically that they might be confused for being the same religion with slightly different names, but on the other hand the way the two religions perceive the state of enlightenment (Moksha/Nirvana) is very different. Hinduism sees Moksha as a very personal event; it sees Moksha an individual being freed from its earthly shackles to go return to - and become a part of - Brahman (the principle that exists in the world). As opposed to the Hindu view of an individual accomplishing this feat, Buddhism proposes that a truly enlightened person understands that there is no true concept of “me” and see Nirvana as a state in which an enlightened person is allowed to escape the otherwise infinite loop of re-birth. In this way, one can see that Hinduism focuses on the actions and events that an individual part-takes in, while Buddhism aims to inform its followers that there is no such concept of and individual. At the same time, this mean that the differences between these two religions could be seen as two sides of the same coin, as they both speak of an idea of not being individuals in some way: Hinduisms ideas of Brahman and Atman and Buddhisms ideas of no one being an individual.</string>
<string name="answer1">Buddhism was founded roughly around the year 500 BCE in what is now called Nepal. The religion is said to be founded by Gautama Buddha. The religion proposes many ideologies on how a person should live their life such as Karma and Nirvana. Karma is in this case a sum of all of the things that you have done, said or in some form taken part in, while Nirvana is an abstract state wherein the user is freed from their humanity; they reach a higher state of mind allowing them to escape the use of things such as egoism or a thirst for life. Nirvana means “blown out” like a candle but could also mean “extinguished” as it is determined to be a state where a human isnt reborn in the enlightened persons stead. As with Buddhism, Hinduism offers some similar aspects in its religion. Some examples of these are once again Karma as well as Moksha which have a similar and corresponding functions to the earlier ones described i.e. Karma is a sum of all the events you have taken part in and Moksha is a state of having escaped the pseudo-infinite re-birth cycle by the name of Samsara. Hinduism was created (very) roughly around 1900 BCE and considering its geographic proximity to India, it is not unlikely that some of the influences of Buddhism in its early stages came from Hinduism, whose origins are pinpointed to the general Indian region. This also means that ancient tribes from the Himalayas migrating to India in circa 2000 BCE also could have brought the earliest versions of pre-Buddhism that could have influenced the creation of Hinduism which later in-turn influenced Buddhism. On one hand, these religions seem so intertwined both historically and geographically that they might be confused for being the same religion with slightly different names, but on the other hand the way the two religions perceive the state of enlightenment (Moksha/Nirvana) is very different. Hinduism sees Moksha as a very personal event; it sees Moksha an individual being freed from its earthly shackles to go return to - and become a part of - Brahman (the principle that exists in the world). As opposed to the Hindu view of an individual accomplishing this feat, Buddhism proposes that a truly enlightened person understands that there is no true concept of “me” and see Nirvana as a state in which an enlightened person is allowed to escape the otherwise infinite loop of re-birth. In this way, one can see that Hinduism focuses on the actions and events that an individual part-takes in, while Buddhism aims to inform its followers that there is no such concept of and individual. At the same time, this mean that the differences between these two religions could be seen as two sides of the same coin, as they both speak of an idea of not being individuals in some way: Hinduisms ideas of Brahman and Atman and Buddhisms ideas of no one being an individual.</string>
<string name="answer2">In both the Theravada and Mahayana subsets of the religion, Nirvana is considered to be an abstract state of being where judgement cant be made and “one” is truly enlightened. Both subsets speak of steps that one takes to achieve such a state which on one hand makes them similar, though on the other hand the different subsets speak very differently about how one reaches Nirvana despite the similar names. For example: The Mahayana subset explains that one must follow the five paths that lead through ten steps to enlightenment and that one by the end will have reached Nirvana. It is also definitely worth mentioning that the Mahayana subset doesnt consider Nirvana to be a final destination, but rather a conduit allowing an enlightened to return to earth to free other creatures. As opposed to Mahayana, Theravada explains that one must follow four steps to become arhat (enlightened) which implies that the follower has been freed from the ten fetters (shackles of humanity). This means that Theravada considers Nirvana to be a final destination, a resting place after a hard life, while Mahayana sees Nirvana as a pathway for the enlightened to follow to help others reach it.</string>
<string name="answer3">On one hand, thirst for life could mean that a person doesnt want to die and perpetually attempt to avoid it at all costs. On the other hand, it could refer to someone who doesnt want to be enlightened and therefore willingly continues being re-born. Either way, they both follow a path of fear and/or general non-enlightenment and keep it that way, meaning that they could never reach Nirvana. As Nirvana is an almost direct opposite to life, as it implies no re-birth and no Karma, it could be argued that Nirvana is what Buddha meant by “true joy”. It is, though, this juxtaposition between Nirvana and life delimited by a thin line that is death that may deter certain individuals from attaining such a state of mind such that they would reach Nirvana. This could mean that Nirvana is both the cause and solution to the fact that life is suffering, as it is the sole reason for why some individuals want to continue living.</string>
<string name="swipe">Swipe from the left of your screen</string>

View File

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<items version="2" >
<item
jar="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.1\jars\classes.jar"
jumboMode="false"
revision="23.0.2"
sha1="6cbc7773921fcfedbe55657578f0cbfe614778dc">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\com.android.support-support-v4-23.1.1_8288700da391593f7b353b6d9f04c71866caed37.jar" />
</item>
<item
jar="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\exploded-aar\com.android.support\design\23.1.1\jars\classes.jar"
jumboMode="false"
revision="23.0.2"
sha1="379471b2bd17d9737c050345c08e8c7d16589784">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\com.android.support-design-23.1.1_7b44be5bb34634977e2c2352b3f8aba8537b3ee8.jar" />
</item>
<item
jar="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.1\jars\classes.jar"
jumboMode="false"
revision="23.0.2"
sha1="5c5699834e9722f1c288fea2de82725d078ba127">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\com.android.support-appcompat-v7-23.1.1_28840fec866b4ae2971b9ab0306574c758390f1c.jar" />
</item>
<item
jar="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\23.1.1\jars\classes.jar"
jumboMode="false"
revision="23.0.2"
sha1="09c5e804bc67fc0580360043dff067df574a60d4">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\com.android.support-recyclerview-v7-23.1.1_1f75052656529ac7d92a03e12a18421c08f299dc.jar" />
</item>
<item
jar="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\exploded-aar\com.github.amlcurran.showcaseview\library\5.4.1\jars\classes.jar"
jumboMode="false"
revision="23.0.2"
sha1="ebc00058bde4597b48ab5c3358a7676e942902f2">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\com.github.amlcurran.showcaseview-library-5.4.1_9aa1ed73291d5a3cb5eca8f25c8af6074bea2c96.jar" />
</item>
<item
jar="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.1\jars\libs\internal_impl-23.1.1.jar"
jumboMode="false"
revision="23.0.2"
sha1="a4de9c81ae239414e1ed0f86441b02abaf29bca9">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\internal_impl-23.1.1_63b15402ae401cba2c796e68bfb8dfd49fdc5737.jar" />
</item>
<item
jar="C:\Users\FuckYou\AppData\Local\Android\sdk\extras\android\m2repository\com\android\support\support-annotations\23.1.1\support-annotations-23.1.1.jar"
jumboMode="false"
revision="23.0.2"
sha1="8d680ba5a623724d1fb0e81c36a790f023a6cede">
<dex dex="C:\Users\FuckYou\Desktop\Android_Projects\Buddhism\app\build\intermediates\pre-dexed\release\support-annotations-23.1.1_96b22c01c92df2dbd2d1f4a92259c235ec5caecd.jar" />
</item>
</items>