Skip to content

Commit d7f0fbd

Browse files
codingblazeropticod
authored andcommitted
try one
build rerun
1 parent 6b2d9e1 commit d7f0fbd

File tree

4 files changed

+17
-18
lines changed

4 files changed

+17
-18
lines changed

source-code/app/src/main/AndroidManifest.xml

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.buildmlearn.toolkit" >
3+
package="org.buildmlearn.toolkit">
44

55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -17,13 +17,12 @@
1717
android:icon="@mipmap/ic_launcher"
1818
android:label="@string/app_name"
1919
android:supportsRtl="true"
20-
android:theme="@style/AppTheme" >
20+
android:theme="@style/AppTheme">
2121
<activity
2222
android:name=".activity.HomeActivity"
2323
android:configChanges="orientation|screenSize"
2424
android:label="@string/app_name"
25-
android:theme="@style/NoActionBarThemeTransparentStatusBar" >
26-
</activity>
25+
android:theme="@style/NoActionBarThemeTransparentStatusBar"></activity>
2726
<activity
2827
android:name=".simulator.Simulator"
2928
android:label="@string/title_activity_simulator"
@@ -33,7 +32,7 @@
3332
android:name=".activity.TemplateActivity"
3433
android:label="@string/title_activity_template"
3534
android:parentActivityName=".activity.HomeActivity"
36-
android:theme="@style/AppTheme.NoActionBar" >
35+
android:theme="@style/AppTheme.NoActionBar">
3736
<meta-data
3837
android:name="android.support.PARENT_ACTIVITY"
3938
android:value="org.buildmlearn.toolkit.activity.HomeActivity" />
@@ -42,8 +41,7 @@
4241
android:name=".activity.TemplateEditor"
4342
android:configChanges="orientation|screenSize"
4443
android:label="@string/title_activity_template_editor"
45-
android:theme="@style/AppTheme.NoActionBar" >
46-
</activity>
44+
android:theme="@style/AppTheme.NoActionBar"></activity>
4745

4846
<meta-data
4947
android:name="io.fabric.ApiKey"
@@ -52,8 +50,8 @@
5250
<activity
5351
android:name=".activity.FirstRunActivity"
5452
android:label="@string/app_name"
55-
android:theme="@style/Buildmlearn.FullScreen"
56-
android:windowSoftInputMode="adjustPan" >
53+
android:theme="@style/SplashTheme"
54+
android:windowSoftInputMode="adjustPan">
5755
<intent-filter>
5856
<action android:name="android.intent.action.MAIN" />
5957

@@ -63,24 +61,23 @@
6361
<activity
6462
android:name=".activity.TutorialActivity"
6563
android:label="@string/title_activity_tutorial"
66-
android:theme="@style/Buildmlearn.FullScreen" >
67-
</activity>
64+
android:theme="@style/Buildmlearn.FullScreen"></activity>
6865
<activity
6966
android:name=".activity.AboutBuildmLearn"
7067
android:label="@string/title_activity_about_buildm_learn"
7168
android:parentActivityName=".activity.HomeActivity"
72-
android:theme="@style/AppTheme.NoActionBar" >
69+
android:theme="@style/AppTheme.NoActionBar">
7370
<meta-data
7471
android:name="android.support.PARENT_ACTIVITY"
7572
android:value="org.buildmlearn.toolkit.activity.HomeActivity" />
7673
</activity>
7774
<activity
7875
android:name=".activity.DeepLinkerActivity"
79-
android:label="@string/title_activity_deep_linker" >
76+
android:label="@string/title_activity_deep_linker">
8077
<intent-filter
8178
android:icon="@mipmap/ic_launcher"
8279
android:label="@string/app_name"
83-
android:priority="1" >
80+
android:priority="1">
8481
<action android:name="android.intent.action.VIEW" />
8582

8683
<category android:name="android.intent.category.DEFAULT" />
@@ -91,13 +88,13 @@
9188
<data android:pathPattern=".*\\.buildmlearn" />
9289
</intent-filter>
9390
</activity>
94-
<activity
95-
android:name=".activity.SettingsLinkerActivity">
91+
<activity android:name=".activity.SettingsLinkerActivity">
9692
<intent-filter>
9793
<action android:name="android.intent.action.MAIN" />
94+
9895
<category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
9996
</intent-filter>
10097
</activity>
10198
</application>
10299

103-
</manifest>
100+
</manifest>

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ protected void onCreate(Bundle savedInstanceState) {
4949
Animation anim_bounceinup=AnimationUtils.loadAnimation(getBaseContext(),R.anim.bounceinup);
5050
name = (EditText) findViewById(R.id.first_name);
5151
name.startAnimation(anim_bounceinup);
52-
5352
name.setOnKeyListener(new View.OnKeyListener() {
5453
@Override
5554
public boolean onKey(View v, int keyCode, KeyEvent event) {
Loading

source-code/app/src/main/res/values/styles.xml

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<item name="android:textColorLink">?attr/colorAccent</item>
1212
<item name="activatedBackgroundIndicator">@drawable/activated_background</item>
1313
</style>
14+
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
15+
<item name="android:windowBackground">@drawable/splashmain</item>
16+
</style>
1417

1518
<style name="AppTheme" parent="Base.AppTheme">
1619
<item name="android:textColorPrimary">@color/black_primary_text</item>

0 commit comments

Comments
 (0)