Created a drawable arrow (xml vector file).

Created simple animation

.idea/dictionaries/Gabriel.xml

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

.idea/gradle.xml

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

README.md

@@ -1,2 +1,2 @@
 # Buddhism
-This project was created for an old school project. It answers the questions posed by my teacher in religion regarding Buddhism as is probably apparent by the name of this repository.
+This project was created as a project for school. It answers the questions posed by my teacher in religion regarding Buddhism as is probably apparent by the name of this repository.

app/src/main/java/com/gabriel/buddhism/MainActivity.java

@@ -9,46 +9,41 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.LayoutInflater;
+import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
+
 import com.github.amlcurran.showcaseview.OnShowcaseEventListener;
 import com.github.amlcurran.showcaseview.ShowcaseView;
+import com.github.amlcurran.showcaseview.targets.ActionItemTarget;
 import com.github.amlcurran.showcaseview.targets.PointTarget;
+import com.github.amlcurran.showcaseview.targets.ViewTarget;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
-
     private Toolbar toolbar;
+    private ActionBarDrawerToggle toggle;
     private int introCounter;
     private ShowcaseView overlay;
-    private static final String TAG_INFO_STAGE="info_stage";
-    private static final String TAG_NAVIGATION_STAGE="nav_stage";
-    private int viewStage;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        viewStage=(savedInstanceState!=null) ? savedInstanceState.getInt(TAG_NAVIGATION_STAGE) : 0;
-        System.out.println("Got stage with value: "+viewStage);
-        introCounter=(savedInstanceState!=null) ? savedInstanceState.getInt(TAG_INFO_STAGE) : 0;
-        System.out.println("Got counter with value: "+introCounter);
+        introCounter=0;
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+
         final DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close) {
+        toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close){
             @Override
             public void onDrawerOpened(View drawerView) {
                 super.onDrawerOpened(drawerView);
-                if (introCounter<1) drawer.closeDrawer(GravityCompat.START);
-                else if(overlay!=null) overlay.hide();
+                if(overlay==null) drawer.closeDrawer(GravityCompat.START);
+                else overlay.hide();
             }
         };
         drawer.setDrawerListener(toggle);
@@ -56,89 +51,90 @@ public class MainActivity extends AppCompatActivity
 
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
-        if(introCounter<2)
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try {if(introCounter==0) Thread.sleep(1000);
-                    } catch (InterruptedException e) {e.printStackTrace();}
-                    new Handler(Looper.getMainLooper()).post(new Runnable() {
-                        @Override
-                        public void run() {intro();
-                        }
-                    });}}).start();
-        else {
-            if(viewStage<2) {
-                LayoutInflater l = getLayoutInflater();
-                View v = l.inflate(R.layout.dynamic_welcome, (RelativeLayout) findViewById(R.id.main_parent));
-                v.findViewById(R.id.arrow).startAnimation(AnimationUtils.loadAnimation(getApplicationContext(), R.anim.arrow_anim));
-                viewStage = 1;
-            }else if (viewStage == 2) loadCorrespondingView(R.id.nav_question1);
-            else if (viewStage == 3) loadCorrespondingView(R.id.nav_question2);
-            else loadCorrespondingView(R.id.nav_question3);
-        }
+        new Thread(new Runnable() {@Override public void run() {
+                try {Thread.sleep(1000);} catch (InterruptedException e) {e.printStackTrace();}
+                new Handler(Looper.getMainLooper()).post(new Runnable() {@Override public void run() {intro();}});}}).start();
+        findViewById(R.id.main).setVisibility(View.GONE);
     }
     public void intro(){
         if(introCounter==0){
+            ++introCounter;
             new ShowcaseView.Builder(this)
                     .replaceEndButton((Button) getLayoutInflater().inflate(R.layout.got_it, (RelativeLayout) findViewById(R.id.main_parent), false))
-                    .setContentTitle(getResources().getText(R.string.welcome))
+                    .setContentTitle("Welcome")
                     .setContentText(getResources().getText(R.string.welcome1))
                     // .replaceEndButton((Button) getLayoutInflater().inflate(R.layout.bye_button, (RelativeLayout) findViewById(R.id.main_parent), false))
                     .setShowcaseEventListener(new OnShowcaseEventListener(){
                         @Override
-                        public void onShowcaseViewHide(ShowcaseView showcaseView) {}
+                        public void onShowcaseViewHide(ShowcaseView showcaseView) {
+
+                        }
+
                         @Override
                         public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
-                            ++introCounter;
                             new Thread(new Runnable() {@Override public void run() {
-                                try {Thread.sleep(750);} catch (InterruptedException e) {e.printStackTrace();}
+                                try {Thread.sleep(1000);} catch (InterruptedException e) {e.printStackTrace();}
                                 new Handler(Looper.getMainLooper()).post(new Runnable() {@Override public void run() {intro();}
                                 });
                             }}).start();
                         }
-                        @Override
-                        public void onShowcaseViewShow(ShowcaseView showcaseView) {}
-                        @Override
-                        public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {}
-                    })
-                    .build();
-        }else if(introCounter==1){
-            overlay = new ShowcaseView.Builder(this).replaceEndButton(R.layout.got_it)
-                    .setTarget(new PointTarget(50, 60))
-                    .replaceEndButton((Button) getLayoutInflater().inflate(R.layout.got_it, (RelativeLayout) findViewById(R.id.main_parent), false))
-                    .setContentTitle(getResources().getText(R.string.introduction))
-                    .setContentText(getResources().getText(R.string.welcome2) + "\n" + getResources().getText(R.string.signoff))
-                    .setShowcaseEventListener(new OnShowcaseEventListener() {
-                        @Override
-                        public void onShowcaseViewHide(ShowcaseView showcaseView) {
-                        }
-
-                        @Override
-                        public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
-                            ++introCounter;
-                            toolbar.postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    intro();
-                                }
-                            }, 250);
-                        }
 
                         @Override
                         public void onShowcaseViewShow(ShowcaseView showcaseView) {
+
                         }
 
                         @Override
                         public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {
+
+                        }
+                    })
+                    .build();
+        }else if(introCounter==1){
+            ++introCounter;
+            overlay = new ShowcaseView.Builder(this).replaceEndButton(R.layout.got_it)
+                    .setTarget(new PointTarget(50, 60))
+                    .replaceEndButton((Button) getLayoutInflater().inflate(R.layout.got_it, (RelativeLayout) findViewById(R.id.main_parent), false))
+                    .setContentTitle("Instructions")
+                    .setContentText(getResources().getText(R.string.welcome2) + "\n" + getResources().getText(R.string.signoff))
+                    .setShowcaseEventListener(new OnShowcaseEventListener() {
+                        @Override
+                        public void onShowcaseViewHide(ShowcaseView showcaseView) {
+
+                        }
+
+
+                        @Override
+                        public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    try {
+                                        Thread.sleep(1000);
+                                    } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                    }
+                                    new Handler(Looper.getMainLooper()).post(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            intro();
+                                        }
+                                    });
+                                }
+                            }).start();
+                        }
+
+                        @Override
+                        public void onShowcaseViewShow(ShowcaseView showcaseView) {
+
+                        }
+
+                        @Override
+                        public void onShowcaseViewTouchBlocked(MotionEvent motionEvent) {
+
                         }
                     })
                     .build();
-        }else if(introCounter==2){
-            LayoutInflater l = getLayoutInflater();
-            View v = l.inflate(R.layout.dynamic_welcome, (RelativeLayout) findViewById(R.id.main_parent));
-            v.findViewById(R.id.arrow).startAnimation(AnimationUtils.loadAnimation(getApplicationContext(), R.anim.arrow_anim));
-            viewStage = 1;
         }
     }
     @Override
@@ -151,46 +147,24 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
-    @Override
-    public void onSaveInstanceState(Bundle b){
-        b.putInt(TAG_INFO_STAGE, introCounter);
-        System.out.println("Stored counter: " + introCounter);
-        b.putInt(TAG_NAVIGATION_STAGE, viewStage);
-        System.out.println("Stored stage: "+viewStage);
-        super.onSaveInstanceState(b);
-    }
-
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
-        if(viewStage==0) return false;
-
         // Handle navigation view item clicks here.
-        loadCorrespondingView(item.getItemId());
+        int id = item.getItemId();
+
+        if (id == R.id.nav_camera) {
+            // Handle the camera action
+        } else if (id == R.id.nav_gallery) {
+
+        } else if (id == R.id.nav_slideshow) {
+
+        } else if (id == R.id.nav_manage) {
+
+        }
+
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
-    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_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));
-        } else if (id == R.id.nav_question2) {
-            viewStage=3;
-            ((TextView) v.findViewById(R.id.question)).setText(getResources().getText(R.string.question2));
-            ((TextView) v.findViewById(R.id.answer)).setText(getResources().getText(R.string.answer2));
-        } else if (id == R.id.nav_question3) {
-            viewStage=4;
-            ((TextView) v.findViewById(R.id.question)).setText(getResources().getText(R.string.question3));
-            ((TextView) v.findViewById(R.id.answer)).setText(getResources().getText(R.string.answer3));
-        }
-    }
 }

app/src/main/res/anim/arrow_anim.xml

@@ -1,7 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
     <translate
         android:fromXDelta="0"
         android:toXDelta="50"
-        android:duration="750"
-        android:repeatCount="infinite"/>
+        android:duration="1000"
+        android:repeatCount="2"/>
+
 </set>

app/src/main/res/drawable/ic_menu_house.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10sp"
-    android:height="13sp"
-    android:viewportHeight="13.0"
-    android:viewportWidth="10.0">
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 14 L7 14 L7 10 L0 10"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M8 14 L10 14 L10 10 L8 10"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 14 L10 14 L10 12 L0 12"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 10.25 L10 10.25 L10 7 L0 7"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M1.5 6.5 L3 6.5 L3 6.25 L1.5 6.25"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M2.125 5.625 L2.125 7.125 L2.375 7.125 L2.375 5.625"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M8.5 6.5 L7 6.5 L7 6.25 L8.5 6.25"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M7.625 5.625 L7.625 7.125 L7.875 7.125 L7.875 5.625"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 8 L0 7.125 L10 7.125 L10 8"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 5.625 L1.5 5.625 L1.5 7.125 L0 7.125"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M8.5 7.125 L8.5 5.625 L10 5.625 L10 7.125"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M3 5.625 L7 5.625 L7 7.125 L3 7.125"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 5.65 L10 5.65 L5 0"/>
-</vector>

app/src/main/res/drawable/number_one.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="4sp"
-    android:height="21sp"
-    android:viewportHeight="21.0"
-    android:viewportWidth="4.0">
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 0 L0 2 L12 2 L12 0"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M1 0 L3 0 L3 20 L1 20"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 19 L12 19 L12 21 L0 21"/>
-</vector>

app/src/main/res/drawable/number_three.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12sp"
-    android:height="21sp"
-    android:viewportHeight="21.0"
-    android:viewportWidth="12.0">
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 0 L12 0 L12 2 L0 2"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 21 L12 21 L12 19 L0 19"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M1 0 L3 0 L3 21 L1 21"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M5 0 L7 0 L7 21 L5 21"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M9 0 L11 0 L11 21 L9 21"/>
-</vector>

app/src/main/res/drawable/number_two.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="8sp"
-    android:height="21sp"
-    android:viewportHeight="21.0"
-    android:viewportWidth="8.0">
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 0 L8 0 L8 2 L0 2"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 21 L8 21 L8 19 L0 19"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M1 0 L3 0 L3 21 L1 21"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M5 0 L7 0 L7 21 L5 21"/>
-</vector>

app/src/main/res/drawable/swipe_arrow.xml

@@ -3,8 +3,10 @@
     android:height="24sp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
-    <path android:fillColor="#FF000000"
-        android:pathData="M0 6 L0 12 L16 12 L16 6 Z"/>
-    <path android:fillColor="#FF000000"
-        android:pathData="M16 0 L16 18 L24 9"/>
+    <group android:name="vector_arrow">
+        <path android:fillColor="#FF000000"
+            android:pathData="M0 6 L0 12 L16 12 L16 6 Z"/>
+        <path android:fillColor="#FF000000"
+            android:pathData="M16 0 L16 18 L24 9"/>
+    </group>
 </vector>

app/src/main/res/layout/content_main.xml

@@ -12,4 +12,27 @@
     tools:context="com.gabriel.buddhism.MainActivity"
     tools:showIn="@layout/app_bar_main"
     android:id="@+id/main_parent">
+
+    <RelativeLayout
+        android:id="@+id/main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="22sp"
+            android:text="@string/swipe"
+            android:id="@+id/swipe"/>
+        <ImageView
+            android:id="@+id/arrow"
+            android:layout_marginStart="10sp"
+            android:layout_marginLeft="10sp"
+            android:layout_marginTop="15sp"
+            android:layout_below="@id/swipe"
+            android:layout_width="50sp"
+            android:layout_height="wrap_content"
+            android:src="@drawable/swipe_arrow"
+            android:scaleType="fitCenter"
+            android:adjustViewBounds="true"/>
+    </RelativeLayout>
 </RelativeLayout>

app/src/main/res/layout/dynamic_answer.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/response_view">
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-            <TextView
-                android:id="@+id/question"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textStyle="bold"
-                android:textSize="25sp"
-                android:textColor="@android:color/white"/>
-            <TextView
-                android:id="@+id/answer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/question"
-                android:layout_marginTop="10sp"
-                android:textSize="20sp"/>
-        </RelativeLayout>
-    </ScrollView>
-</LinearLayout>

app/src/main/res/layout/dynamic_text.xml

@@ -1,7 +0,0 @@
-<?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"/>

app/src/main/res/layout/dynamic_welcome.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="22sp"
-        android:text="@string/swipe"
-        android:id="@+id/swipe"/>
-    <ImageView
-        android:id="@+id/arrow"
-        android:layout_margin="10sp"
-        android:layout_below="@id/swipe"
-        android:layout_width="50sp"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/sttr"
-        android:src="@drawable/swipe_arrow"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"/>
-    <TextView
-        android:id="@+id/lang"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/arrow"
-        android:layout_marginTop="10sp"
-        android:textSize="22sp"
-        android:text="@string/lang"/>
-    <TextView
-        android:id="@+id/lang_en"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/lang"
-        android:layout_marginStart="10sp"
-        android:layout_marginLeft="10sp"
-        android:layout_marginTop="15sp"
-        android:padding="5sp"
-        android:background="@android:color/holo_blue_dark"
-        android:textSize="30sp"
-        android:text="@string/lang_en"/>
-    <TextView
-        android:id="@+id/lang_sv"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/lang_en"
-        android:layout_marginStart="10sp"
-        android:layout_marginLeft="10sp"
-        android:layout_marginTop="15sp"
-        android:padding="5sp"
-        android:background="@android:color/holo_blue_dark"
-        android:textSize="30sp"
-        android:text="@string/lang_sv"/>
-</RelativeLayout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -3,21 +3,21 @@
 
     <group android:checkableBehavior="single">
         <item
-            android:id="@+id/nav_home"
-            android:icon="@drawable/ic_menu_house"
-            android:title="@string/label_home"/>
+            android:id="@+id/nav_camera"
+            android:icon="@drawable/ic_menu_camera"
+            android:title="Import" />
         <item
-            android:id="@+id/nav_question1"
-            android:icon="@drawable/number_one"
-            android:title="@string/label_q1" />
+            android:id="@+id/nav_gallery"
+            android:icon="@drawable/ic_menu_gallery"
+            android:title="Gallery" />
         <item
-            android:id="@+id/nav_question2"
-            android:icon="@drawable/number_two"
-            android:title="@string/label_q2" />
+            android:id="@+id/nav_slideshow"
+            android:icon="@drawable/ic_menu_slideshow"
+            android:title="Slideshow" />
         <item
-            android:id="@+id/nav_question3"
-            android:icon="@drawable/number_three"
-            android:title="@string/label_q3" />
+            android:id="@+id/nav_manage"
+            android:icon="@drawable/ic_menu_manage"
+            android:title="Tools" />
     </group>
 
 </menu>

app/src/main/res/values-sv/strings.xml

@@ -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 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 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>
@@ -12,15 +12,4 @@
     <string name="answer1">Buddhismen skapades någon gång runt 500 före Kristus i nuvarande Nepal. Den grundades av Gautama Buddha. Den framför många intressanta livsideologier som t.ex. ideologin om Karma samt Nirvana. Karma är i detta fall en summa av allt du har gjort eller tänkt och Nirvana är ett tillstånd där man är befriad från sin livstörst och egoism. Nirvana betyder ”att blåsas ut” eller ”släckas” som en låga. Likaså i Hinduismen finns det Karma och Moksha som fungerar på liknande sätt, där Karma än en gång är summan av allt du gör i ditt liv och Moksha är ett tillstånd av befrielse från livets pseudo-eviga cykel. Hinduismen skapades någon gång runt 1900 före Kristus och med tanke på dess geografiska position så är det definitivt möjligt att Buddhismen baserade många av dess ideologier på de som Hinduismen hade framfört. Å ena sidan verkar dessa aspekter av respektive religion vara nästan ekvivalenta, med tanke på att de båda ser på Nirvana respektive Moksha som en sorts befrielse. Men å andra sidan ser Hinduismen Moksha som en befrielse från att vara mänsklig; att man som individ blir en del av Brahman (d.v.s. världssjälen). Till skillnad från Hinduismen, ser Buddhismen på Nirvana som en sorts uppenbarelse: att man förstår att det inte finns något ”jag”. På detta sätt kan man se att de två religionerna skiljer sig åt väldigt mycket, då en fokuserar på en som individ och vad en som individ kan åstadkomma, medan den andra fokuserar på att påvisa för lärlingar att det inte finns någon individ d.v.s. att alla är en del av samma sak. Samtidigt som de skiljer sig åt så kan man ändå påvisa att de fortfarande liknar varandra, då Hinduismen dessutom talar om Brahman som en världssjäl som man åter blir en med när man bryter sig ur Samsara. Hinduismen talar om att en liten bit av Brahman finns i alla människor, denna bit kallas för Atman.</string>
     <string name="answer2">Inom både Theravada- och Mahayana-inriktningarna av Buddhismen anses Nirvana vara ett abstrakt tillstånd av uppenbarelse och klarhet vilket dessutom innebär att man brutit sig ur Samsara (d.v.s. livets pseudo-eviga cykel). Båda inriktningarna talar dessutom om steg eller vägar för att uppnå Nirvana. Å ena sidan verkar de ha liknande steg för att uppnå Nirvana. Å andra sidan så beskriver Mahayana dessa vägar som ”fem vägar” som en troende följer som leder denne genom tio ”steg” eller ”nivåer” som leder till Nirvana, medan Theravada talar om fyra steg som slutar i att den troende blir en ”arhat” och har då flytt de tio ”fetter” (kedjor, eller något som håller en grundad/fast). Detta innebär att Theravada anser att Nirvana är flykt från livet medan Mahayana anser att det är något som man har jobbat hårt för att uppnå. (Det är dessutom värt att påpeka att Mahayana inte anser att Nirvana är det ultimata steget och att de tror på att den som uppnått Nirvana kommer att återvända för att befria andra varelser från Samsara).</string>
     <string name="answer3">Å ena sidan kan livstörst referera till att man som människa vill fortsätta återskapas efter döden, eller att man inte vill dö. Beroende på vilket man tror att det är kan lidandet antingen vara att man aldrig kan bli uppenbarad i Nirvana, och att man alltid kommer att vara blind på grund av sin mänsklighet (egoism, icke-vetande, skadligt beteende vare sig p.g.a. har man agerar eller hur man talar, etc.), eller eftersom man lever i konstant farhåga av att man dör, vilket också kan anses vara mänskligt och betyder också att man inte kommer att uppnå Nirvana.</string>
-    <string name="lang">Om det är något som du anser vara nödvändigt, kan du ändra språket</string>
-    <string name="sttr">Dra åt höger</string>
-    <string name="swipe">Dra från den vänstra sidan av skärmen</string>
-    <string name="lang_en">Engelska</string>
-    <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>

app/src/main/res/values/strings.xml

@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name" translatable="false">Buddhism</string>
+
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="welcome1">Hello!\nThis application was designed with the express intent of giving the answers to three distinct questions regarding Buddhism assigned to me (and the rest of my class) by Helena Sontag.</string>
@@ -9,18 +10,8 @@
     <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 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 isn’t reborn in the enlightened person’s 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 Buddhism’s ideas of no one being an individual.</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 isn’t reborn in the enlightened person’s 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 Buddhism’s 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 can’t 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 doesn’t 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 doesn’t want to die and perpetually attempt to avoid it at all costs. On the other hand, it could refer to someone who doesn’t 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>
-    <string name="sttr">Swipe to the right</string>
-    <string name="lang">If you are so inclined, you may select another language</string>
-    <string name="lang_en">English</string>
-    <string name="lang_sv">Swedish</string>
-    <string name="welcome">Welcome</string>
-    <string name="introduction">Introduction</string>
-    <string name="label_q1">Question 1</string>
-    <string name="label_q2">Question 2</string>
-    <string name="label_q3">Question 3</string>
-    <string name="label_home">Home</string>
 </resources>

build/intermediates/dex-cache/cache.xml

@@ -1,54 +0,0 @@
-<?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>