Skip to content

Commit

Permalink
Merge pull request #34 from elimu-ai/33-Rename-from-literacyapp-to-elimu
Browse files Browse the repository at this point in the history
#33 Rename from literacyapp to elimu
  • Loading branch information
nya-elimu authored Dec 24, 2018
2 parents 78c2bf7 + 3b8ca8e commit ece4e81
Show file tree
Hide file tree
Showing 32 changed files with 97 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ android:
- extra-android-m2repository

notifications:
# slack: literacyapp:HLjtHJdZ7DYJV2DlnDLrG6Gl
slack: elimu-ai:5hNcmHPFkAETjJZjrkBlNTxr
email: false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# literacyapp-start-guide
# start-guide
Android application teaching basic tablet UI navigation

![screenshot_20170605-194552](https://cloud.githubusercontent.com/assets/15718174/26795982/fee64200-4a27-11e7-9c2a-e000efefda3a.png)
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
defaultConfig {
applicationId "org.literacyapp.startguide"
applicationId "ai.elimu.startguide"
minSdkVersion 21
targetSdkVersion 23
versionCode 1000004
versionName "1.0.4"
versionCode 2000000
versionName "2.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide;
package ai.elimu.startguide;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
Expand All @@ -21,6 +21,6 @@ public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("org.literacyapp.startguide", appContext.getPackageName());
assertEquals("ai.elimu.startguide", appContext.getPackageName());
}
}
14 changes: 7 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.literacyapp.startguide">
package="ai.elimu.startguide">

<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

Expand All @@ -11,7 +11,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".content.swipe.SwipeUpDownActivity"
android:name="ai.elimu.startguide.content.swipe.SwipeUpDownActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:noHistory="true">
<intent-filter>
Expand All @@ -21,23 +21,23 @@
</intent-filter>
</activity>
<activity
android:name=".content.swipe.SwipeRightLeftActivity"
android:name="ai.elimu.startguide.content.swipe.SwipeRightLeftActivity"
android:noHistory="true"/>
<activity
android:name=".content.ExitFullScreenActivity"
android:name="ai.elimu.startguide.content.ExitFullScreenActivity"
android:configChanges="orientation|screenSize"/>
<activity
android:name=".content.FinalActivity"
android:name="ai.elimu.startguide.content.FinalActivity"
android:noHistory="true"/>
<activity android:name=".TestGestureActivity">
<activity android:name="ai.elimu.startguide.TestGestureActivity">
<!--<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>-->
</activity>

<receiver android:name=".receiver.BootReceiver">
<receiver android:name="ai.elimu.startguide.receiver.BootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"/>
</intent-filter>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package org.literacyapp.startguide;
package ai.elimu.startguide;

import android.app.Activity;
import android.os.Bundle;

import org.literacyapp.handgesture.HandView;
import ai.elimu.handgesture.HandView;
import ai.elimu.startguide.R;

import static org.literacyapp.handgesture.Gestures.DOUBLE_TAP;
import static org.literacyapp.handgesture.Gestures.PRESS_AND_HOLD;
import static org.literacyapp.handgesture.Gestures.SINGLE_TAP;
import static ai.elimu.handgesture.Gestures.DOUBLE_TAP;
import static ai.elimu.handgesture.Gestures.PRESS_AND_HOLD;
import static ai.elimu.handgesture.Gestures.SINGLE_TAP;

public class TestGestureActivity extends Activity {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.content;
package ai.elimu.startguide.content;

import android.app.Activity;
import android.content.Intent;
Expand All @@ -7,10 +7,10 @@
import android.view.MotionEvent;
import android.view.View;

import org.literacyapp.handgesture.HandView;
import org.literacyapp.handgesture.HandViewListener;
import org.literacyapp.startguide.R;
import org.literacyapp.startguide.util.MediaPlayerHelper;
import ai.elimu.handgesture.HandView;
import ai.elimu.handgesture.HandViewListener;
import ai.elimu.startguide.R;
import ai.elimu.startguide.util.MediaPlayerHelper;

public class ExitFullScreenActivity extends Activity {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.content;
package ai.elimu.startguide.content;

import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
Expand All @@ -8,10 +8,10 @@
import android.view.View;
import android.widget.ImageView;

import org.literacyapp.startguide.R;
import org.literacyapp.startguide.util.MediaPlayerHelper;
import ai.elimu.startguide.R;
import ai.elimu.startguide.util.MediaPlayerHelper;

import static org.literacyapp.startguide.util.MediaPlayerHelper.DEFAULT_PLAYER_DELAY;
import static ai.elimu.startguide.util.MediaPlayerHelper.DEFAULT_PLAYER_DELAY;


public class FinalActivity extends AppCompatActivity {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.content.swipe;
package ai.elimu.startguide.content.swipe;

import android.content.Intent;
import android.content.res.TypedArray;
Expand All @@ -13,11 +13,11 @@
import android.view.ViewGroup;
import android.widget.ImageView;

import org.literacyapp.handgesture.HandView;
import org.literacyapp.handgesture.HandViewListener;
import org.literacyapp.startguide.R;
import org.literacyapp.startguide.content.ExitFullScreenActivity;
import org.literacyapp.startguide.util.MediaPlayerHelper;
import ai.elimu.handgesture.HandView;
import ai.elimu.handgesture.HandViewListener;
import ai.elimu.startguide.R;
import ai.elimu.startguide.content.ExitFullScreenActivity;
import ai.elimu.startguide.util.MediaPlayerHelper;

/**
* Activity that explain swipe right and left
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.content.swipe;
package ai.elimu.startguide.content.swipe;

import android.content.Intent;
import android.content.res.TypedArray;
Expand All @@ -9,11 +9,11 @@
import android.view.View;
import android.widget.RelativeLayout;

import org.literacyapp.handgesture.Gestures;
import org.literacyapp.handgesture.HandView;
import org.literacyapp.handgesture.HandViewListener;
import org.literacyapp.startguide.R;
import org.literacyapp.startguide.util.MediaPlayerHelper;
import ai.elimu.handgesture.Gestures;
import ai.elimu.handgesture.HandView;
import ai.elimu.handgesture.HandViewListener;
import ai.elimu.startguide.R;
import ai.elimu.startguide.util.MediaPlayerHelper;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.content.swipe;
package ai.elimu.startguide.content.swipe;

import android.content.res.TypedArray;
import android.support.v7.widget.RecyclerView;
Expand All @@ -8,7 +8,7 @@
import android.view.ViewGroup;
import android.widget.ImageView;

import org.literacyapp.startguide.R;
import ai.elimu.startguide.R;

/**
* Created by GSC on 30/01/2017.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package org.literacyapp.startguide.receiver;
package ai.elimu.startguide.receiver;

import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;

import org.literacyapp.startguide.content.swipe.SwipeUpDownActivity;
import org.literacyapp.startguide.util.StartPrefsHelper;


public class BootReceiver extends BroadcastReceiver {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.util;
package ai.elimu.startguide.util;

import android.content.Context;
import android.media.MediaPlayer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide.util;
package ai.elimu.startguide.util;

import android.content.Context;
import android.content.SharedPreferences;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_exit_full_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_blue"
tools:context="org.literacyapp.startguide.content.ExitFullScreenActivity">
tools:context="ai.elimu.startguide.content.ExitFullScreenActivity">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/landscape"
android:scaleType="centerCrop"/>

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/hand_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -53,7 +53,7 @@
android:src="@drawable/ic_recents"/>
</RelativeLayout>

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/hand_view_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_final.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
tools:context="org.literacyapp.startguide.content.FinalActivity">
tools:context="ai.elimu.startguide.content.FinalActivity">

<ImageView
android:id="@+id/final_checkmark"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_swipe_right_left.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="org.literacyapp.startguide.content.swipe.SwipeRightLeftActivity">
tools:context="ai.elimu.startguide.content.swipe.SwipeRightLeftActivity">

<android.support.v4.view.ViewPager
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/right_hand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -26,7 +26,7 @@
app:animationType="moveLeft"
app:hideOnTouch="false"/>

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/left_hand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_swipe_up_down.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
tools:context="org.literacyapp.startguide.content.swipe.SwipeUpDownActivity" >
tools:context="ai.elimu.startguide.content.swipe.SwipeUpDownActivity" >

<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/item_main"/>

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/hand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout/activity_test_gesture.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.literacyapp.startguide.TestGestureActivity" >
tools:context="ai.elimu.startguide.TestGestureActivity" >

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/single_tap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp" />

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/double_tap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp"
android:layout_alignParentRight="true"/>

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/press_and_hold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="30dp"
android:layout_below="@id/single_tap" />

<org.literacyapp.handgesture.HandView
<ai.elimu.handgesture.HandView
android:id="@+id/translation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_swipe_right_left.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:id="@+id/pager_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.literacyapp.startguide.content.swipe.SwipeRightLeftActivity$PlaceholderFragment">
tools:context="ai.elimu.startguide.content.swipe.SwipeRightLeftActivity$PlaceholderFragment">

<ImageView
android:id="@+id/left_image"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.literacyapp.startguide;
package ai.elimu.startguide;

import org.junit.Test;

Expand Down
Loading

0 comments on commit ece4e81

Please sign in to comment.