Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#412 Add missing letter vectors #413

Merged
merged 3 commits into from
Jun 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.GridLayout;
Expand Down Expand Up @@ -39,6 +40,8 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_videos);

getWindow().setStatusBarColor(Color.parseColor("#852196"));

Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Bundle;
Expand Down Expand Up @@ -45,6 +46,8 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_numbers);

getWindow().setStatusBarColor(Color.parseColor("#1C80CF"));

Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.media.MediaPlayer;
import android.net.Uri;
import android.os.Bundle;
Expand Down Expand Up @@ -41,6 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {

setContentView(R.layout.activity_number);

getWindow().setStatusBarColor(Color.parseColor("#1C80CF"));

numberImageView = (ImageView) findViewById(R.id.numberImageView);
numberTextView = (TextView) findViewById(R.id.numberTextView);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Intent;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
import android.media.MediaPlayer;
Expand Down Expand Up @@ -41,6 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {

setContentView(R.layout.activity_number_grapheme);

getWindow().setStatusBarColor(Color.parseColor("#1C80CF"));

graphemeImageView = (ImageView) findViewById(R.id.graphemeImageView);

graphemeNextButton = (ImageButton) findViewById(R.id.loadingNextButton);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ protected void onCreate(Bundle savedInstanceState) {

setContentView(R.layout.activity_select_number);

getWindow().setStatusBarColor(Color.parseColor("#1C80CF"));

rippleBackground = (RippleBackground) findViewById(R.id.rippleBackground);
listenButton = (Button) findViewById(R.id.listenButton);
alt1Button = (Button) findViewById(R.id.alt1Button);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.literacyapp.content.task;

import android.graphics.Color;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
Expand All @@ -19,6 +20,8 @@ protected void onCreate(Bundle savedInstanceState) {

setContentView(R.layout.activity_tag_items);

getWindow().setStatusBarColor(Color.parseColor("#1C80CF"));

mTagItemsImageView = (ImageView) findViewById(R.id.tagItemsImageView);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ protected void onCreate(Bundle savedInstanceState) {

setContentView(R.layout.activity_type_number);

getWindow().setStatusBarColor(Color.parseColor("#1C80CF"));

graphemeImageView = (ImageView) findViewById(R.id.graphemeImageView);

editText = (EditText) findViewById(R.id.text);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.literacyapp.content.task;

import android.content.Intent;
import android.graphics.Color;
import android.media.MediaPlayer;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
Expand Down Expand Up @@ -30,6 +31,8 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_video);

getWindow().setStatusBarColor(Color.parseColor("#852196"));

LiteracyApplication literacyApplication = (LiteracyApplication) getApplicationContext();
videoDao = literacyApplication.getDaoSession().getVideoDao();

Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/animated_letter_o.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/letter_o">

<target
android:animation="@animator/path"
android:name="stroke1" />

</animated-vector>
16 changes: 16 additions & 0 deletions app/src/main/res/drawable/letter_o.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="1200dp"
android:height="1776dp"
android:viewportWidth="1200.0"
android:viewportHeight="1776.0">

<path
android:name="stroke1"
android:pathData="M350.3,1047a250.1,288.9 0,1 0,500.2 0a250.1,288.9 0,1 0,-500.2 0z"
android:strokeLineCap="round"
android:strokeColor="#000000"
android:fillColor="#00000000"
android:strokeWidth="64.0"
android:strokeLineJoin="round"
android:strokeAlpha="1.0"/>
</vector>