r/emotionhero
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Prepare to add action bar to Credits screen

Browse source
This commit is contained in:
Ruben 2017-09-08 10:26:55 +02:00
parent 433e09d454
commit 4645ae4a6b
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -9,8 +9,8 @@ android {
applicationId 'com.rubenvandeven.emotion_hero.kiosk' applicationId 'com.rubenvandeven.emotion_hero.kiosk'
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 24 targetSdkVersion 24
versionCode 9 versionCode 10
versionName '1.1' versionName '1.2'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 16 renderscriptTargetApi 16

7
app/src/main/java/com/rubenvandeven/emotionhero/CreditsActivity.java
View file

@ -7,6 +7,7 @@ import android.graphics.Typeface;
import android.net.Uri; import android.net.Uri;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@ -21,6 +22,12 @@ public class CreditsActivity extends AppCompatActivity {
if(getSupportActionBar() != null) { if(getSupportActionBar() != null) {
getSupportActionBar().hide(); getSupportActionBar().hide();
} }
// TODO: verander naar MET toolbar voor 'terug'
// Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
// setSupportActionBar(toolbar);
// getSupportActionBar().setDisplayHomeAsUpEnabled(true);
// getSupportActionBar().setTitle("Credits");
setContentView(R.layout.activity_credits); setContentView(R.layout.activity_credits);
Typeface font = Typeface.createFromAsset(getAssets(), "unifont-9.0.02.ttf"); Typeface font = Typeface.createFromAsset(getAssets(), "unifont-9.0.02.ttf");

4
app/src/main/res/layout/activity_credits.xml
View file

@ -9,13 +9,13 @@
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
tools:context="com.rubenvandeven.emotionhero.CreditsActivity"> tools:context="com.rubenvandeven.emotionhero.CreditsActivity">
<ScrollView <ScrollView
android:id="@+id/creditsLayout" android:id="@+id/creditsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true"
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"