Skip to content

Commit 8dc3452

Browse files
opticodopticod
committed
git push origin bug-fixesMerge branch 'codingblazer-new' into bug-fixes
2 parents 9d1382a + 88975f2 commit 8dc3452

File tree

8 files changed

+324
-192
lines changed

8 files changed

+324
-192
lines changed

‎source-code/app/build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ dependencies {
5555
compile 'com.android.support:cardview-v7:23.4.0'
5656
compile 'com.android.support:recyclerview-v7:23.4.0'
5757
compile 'com.android.support:design:23.4.0'
58-
compile 'com.cocosw:bottomsheet:1.3.0@aar'
5958
compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
6059
transitive = true;
6160
}
@@ -67,7 +66,6 @@ dependencies {
6766
compile files('libs/kellinwood-logging-log4j-1.0.jar')
6867
compile files('libs/axml.jar')
6968

70-
7169
compile 'com.squareup.picasso:picasso:2.5.2'
7270
compile 'org.jsoup:jsoup:1.9.1'
7371
androidTestCompile 'com.android.support:support-annotations:23.4.0'

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

+208-163
Large diffs are not rendered by default.

‎source-code/app/src/main/res/anim/popup_hide.xml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
<translate
4+
android:fromYDelta="0"
5+
android:toYDelta="100%p"
6+
android:duration="300"
7+
android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
8+
</set>

‎source-code/app/src/main/res/anim/popup_show.xml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<set xmlns:android="http://schemas.android.com/apk/res/android">
3+
<translate
4+
android:fromYDelta="100%p"
5+
android:toYDelta="0"
6+
android:duration="300"
7+
android:interpolator="@android:anim/accelerate_decelerate_interpolator"/>
8+
</set>

‎source-code/app/src/main/res/drawable/touch_selector_white.xml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:drawable="@android:color/darker_gray" android:state_activated="true" android:state_focused="false" />
5+
<item android:drawable="@android:color/white" android:state_window_focused="false" />
6+
<item android:drawable="@drawable/abc_list_selector_holo_light" android:state_enabled="false" android:state_focused="true" android:state_pressed="true" />
7+
<item android:drawable="@drawable/abc_list_selector_holo_light" android:state_enabled="false" android:state_focused="true" />
8+
<item android:drawable="@drawable/abc_list_selector_holo_light" android:state_focused="true" android:state_pressed="true" />
9+
<item android:drawable="@drawable/abc_list_selector_holo_light" android:state_focused="false" android:state_pressed="true" />
10+
<item android:drawable="@drawable/abc_list_selector_holo_light" android:state_focused="true" />
11+
<item android:drawable="@android:color/white" />
12+
</selector>

‎source-code/app/src/main/res/layout/bottom_sheet_view.xml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/popup_window"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:layout_gravity="bottom|center"
7+
android:background="@android:color/white"
8+
android:orientation="vertical"
9+
android:padding="10dp">
10+
11+
12+
<TextView
13+
android:id="@+id/txt_save_apk"
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
android:background="@drawable/touch_selector_white"
17+
android:clickable="true"
18+
android:drawableLeft="@drawable/save_apk"
19+
android:drawablePadding="24dp"
20+
android:gravity="center_vertical"
21+
android:padding="10dp"
22+
android:text="@string/bottom_sheet_save_apk"
23+
android:textAppearance="?android:attr/textAppearanceSmall"
24+
android:textColor="@color/black_primary_text"
25+
android:textStyle="bold"
26+
/>
27+
28+
<TextView
29+
android:id="@+id/txt_save_project"
30+
android:layout_width="match_parent"
31+
android:layout_height="wrap_content"
32+
android:background="@drawable/touch_selector_white"
33+
android:clickable="true"
34+
android:drawableLeft="@drawable/save_project"
35+
android:drawablePadding="24dp"
36+
android:gravity="center_vertical"
37+
android:padding="10dp"
38+
android:text="@string/bottom_sheet_save_project"
39+
android:textAppearance="?android:attr/textAppearanceSmall"
40+
android:textColor="@color/black_primary_text"
41+
android:textStyle="bold" />
42+
43+
<TextView
44+
android:id="@+id/txt_share_apk"
45+
android:layout_width="match_parent"
46+
android:layout_height="wrap_content"
47+
android:background="@drawable/touch_selector_white"
48+
android:clickable="true"
49+
android:drawableLeft="@drawable/share_apk"
50+
android:drawablePadding="24dp"
51+
android:gravity="center_vertical"
52+
android:padding="10dp"
53+
android:text="@string/bottom_sheet_share_apk"
54+
android:textAppearance="?android:attr/textAppearanceSmall"
55+
android:textColor="@color/black_primary_text"
56+
android:textStyle="bold" />
57+
58+
<TextView
59+
android:id="@+id/txt_share_project"
60+
android:layout_width="match_parent"
61+
android:layout_height="wrap_content"
62+
android:background="@drawable/touch_selector_white"
63+
android:clickable="true"
64+
android:drawableLeft="@drawable/ic_group_work_black_24dp"
65+
android:drawablePadding="24dp"
66+
android:gravity="center_vertical"
67+
android:padding="10dp"
68+
android:text="@string/bottom_sheet_share_project"
69+
android:textAppearance="?android:attr/textAppearanceSmall"
70+
android:textColor="@color/black_primary_text"
71+
android:textStyle="bold" />
72+
73+
</LinearLayout>

‎source-code/app/src/main/res/menu/bottom_sheet_template.xml

-27
This file was deleted.

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

+15
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@
1515
<item name="android:windowBackground">@drawable/background_splash</item>
1616
</style>
1717

18+
<style name="MaterialDialogSheet" parent="@android:style/Theme.Dialog">
19+
<item name="android:windowIsTranslucent">true</item>
20+
<item name="android:windowBackground">@android:color/transparent</item>
21+
<item name="android:windowContentOverlay">@null</item>
22+
<item name="android:windowNoTitle">true</item>
23+
<item name="android:backgroundDimEnabled">true</item>
24+
<item name="android:windowIsFloating">false</item>
25+
<item name="android:windowAnimationStyle">@style/MaterialDialogSheetAnimation</item>
26+
<item name="android:textColor">@color/black_primary_text</item>
27+
</style>
28+
29+
<style name="MaterialDialogSheetAnimation">
30+
<item name="android:windowEnterAnimation">@anim/popup_show</item>
31+
<item name="android:windowExitAnimation">@anim/popup_hide</item>
32+
</style>
1833
<style name="AppTheme" parent="Base.AppTheme">
1934
<item name="android:textColorPrimary">@color/black_primary_text</item>
2035
<item name="android:textColorSecondary">@color/black_secondary_text</item>

0 commit comments

Comments
 (0)