Removed settings menu.

Set up an automatic (and slick) tutorial.
Added Swedish localization.
Added the questions. (Localized)

app/src/main/AndroidManifest.xml

@@ -11,16 +11,13 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/Theme.AppCompat.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".MainActivity$SettingsDialogue"
-            android:label="Settings"
-            android:theme="@style/AlertDialog.AppCompat" />
     </application>
 
 </manifest>

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

@@ -1,20 +1,18 @@
 package com.gabriel.buddhism;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
+import android.os.Handler;
-import android.support.design.widget.Snackbar;
+import android.os.Looper;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 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.Menu;
+import android.view.Gravity;
 import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
 import android.widget.Button;
 import android.widget.RelativeLayout;
 
@@ -26,43 +24,46 @@ 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 FloatingActionButton fab;
+    private ShowcaseView overlay;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         introCounter=0;
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
 
-        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        final DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
-        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+        toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close){
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                if(overlay==null) drawer.closeDrawer(GravityCompat.START);
+                else overlay.hide();
+            }
+        };
         drawer.setDrawerListener(toggle);
         toggle.syncState();
 
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
-        intro();
+        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)
-                    .setContentTitle("Showcasing!")
+                    .replaceEndButton((Button) getLayoutInflater().inflate(R.layout.got_it, (RelativeLayout) findViewById(R.id.main_parent), false))
-                    .setContentText("This is a 'Floating Action Button'!")
+                    .setContentTitle("Welcome")
-                    .withHoloShowcase()
+                    .setContentText(getResources().getText(R.string.welcome1))
                     // .replaceEndButton((Button) getLayoutInflater().inflate(R.layout.bye_button, (RelativeLayout) findViewById(R.id.main_parent), false))
-                    .hideOnTouchOutside()
                     .setShowcaseEventListener(new OnShowcaseEventListener(){
                         @Override
                         public void onShowcaseViewHide(ShowcaseView showcaseView) {
@@ -71,7 +72,55 @@ public class MainActivity extends AppCompatActivity
 
                         @Override
                         public void onShowcaseViewDidHide(ShowcaseView showcaseView) {
-                            intro();
+                            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==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
@@ -97,28 +146,6 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
@@ -139,10 +166,4 @@ public class MainActivity extends AppCompatActivity
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
-    public class SettingsDialogue extends Activity {
-        @Override
-        public void onCreate(Bundle b){
-            super.onCreate(b);
-        }
-    }
 }

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

@@ -23,12 +23,4 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>

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

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Button
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:visibility="gone"
-    android:id="@+id/button">
-
-</Button>

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

@@ -12,26 +12,31 @@
     tools:context="com.gabriel.buddhism.MainActivity"
     tools:showIn="@layout/app_bar_main"
     android:id="@+id/main_parent">
-    <TextView
+    <RelativeLayout
-        android:id="@+id/Welcome1"
+        android:id="@+id/main"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent">
-        android:textSize="17sp"
+        <TextView
-        android:text="@string/welcome1" />
+            android:id="@+id/Welcome1"
-    <TextView
+            android:layout_width="wrap_content"
-        android:id="@+id/Welcome2"
+            android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
+            android:textSize="17sp"
-        android:layout_height="wrap_content"
+            android:text="@string/welcome1" />
-        android:layout_marginTop="15sp"
+        <TextView
-        android:layout_below="@id/Welcome1"
+            android:id="@+id/Welcome2"
-        android:textSize="17sp"
+            android:layout_width="wrap_content"
-        android:text="@string/welcome2"/>
+            android:layout_height="wrap_content"
-    <TextView
+            android:layout_marginTop="15sp"
-        android:id="@+id/signoff"
+            android:layout_below="@id/Welcome1"
-        android:layout_width="wrap_content"
+            android:textSize="17sp"
-        android:layout_height="wrap_content"
+            android:text="@string/welcome2"/>
-        android:layout_marginTop="15sp"
+        <TextView
-        android:layout_below="@id/Welcome2"
+            android:id="@+id/signoff"
-        android:textSize="15sp"
+            android:layout_width="wrap_content"
-        android:text="@string/signoff"/>
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15sp"
+            android:layout_below="@id/Welcome2"
+            android:textSize="15sp"
+            android:text="@string/signoff"/>
+    </RelativeLayout>
 </RelativeLayout>

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

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:context=".MainActivity.SettingsDialogue">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="5sp"
-        android:textSize="30sp"
-        android:text="Test"/>
-    <Switch
-        android:id="@+id/theme"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_marginStart="20sp"
-        android:layout_marginLeft="20sp"
-        android:layout_marginEnd="20sp"
-        android:layout_marginRight="20sp"
-        android:layout_marginTop="15sp"
-        android:textSize="20sp"
-        android:text="Text"/>
-
-</LinearLayout>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="top|center_horizontal"
+    android:background="@android:color/transparent"
+    android:id="@+id/got_it"
+    android:text="@string/got_it"/>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
-</menu>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="got_it">JAG FÖRSTÅR</string>
+    <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="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>
+    <string name="question3">Buddha menade att människans livstörst gör livet till ett lidande. Vad menar han med det och vad är i sådana fall sann lycka?</string>
+</resources>

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

@@ -1,10 +1,13 @@
 <resources>
-    <string name="app_name">Buddhism</string>
+    <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="action_settings">Settings</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>
-    <string name="welcome2">To begin, swipe from the left of your screen to open the navigation bar. Simply click on the answer you would like to view from the navigation bar to navigate to the corresponding answer.</string>
+    <string name="welcome2">To begin, swipe from the left of your screen or tap the marked icon to open the navigation bar. Simply click on the answer you would like to view from the navigation bar to navigate to the corresponding answer.</string>
     <string name="signoff">Sincerely, Gabriel Tofvesson</string>
+    <string name="got_it">GOT IT</string>
+    <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>
 </resources>