Skip to content

Commit ab6caf5

Browse files
NehaDhanwaniNehaDhanwani
committed
Merge pull request #7 from ashishg656/UI_Changes
Ui changes
2 parents c85b511 + b52ff22 commit ab6caf5

35 files changed

Lines changed: 294 additions & 314 deletions

‎source-code/app/app.iml‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -65,69 +65,73 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7170
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.afollestad/material-dialogs/0.7.4.2/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
7672
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/21.0.3/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.1.1/jars" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.cocosw/bottomsheet/1.1.1/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.cocosw/bottomsheet/1.2.0/jars" />
8077
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/answers/1.2.1/jars" />
8178
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.2/jars" />
8279
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.1/jars" />
8380
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.3.1/jars" />
8481
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.daimajia.androidanimations/library/1.1.3/jars" />
8582
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.daimajia.easing/library/1.0.1/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getbase/floatingactionbutton/1.9.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.afollestad.material-dialogs/commons/0.8.5.3/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.afollestad.material-dialogs/core/0.8.5.3/jars" />
8785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.viewpagerindicator/library/2.4.1/jars" />
8886
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.2/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.zhanghai.android.materialprogressbar/library/1.1.4/jars" />
8988
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
9999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
100100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101103
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
102104
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
103105
</content>
104-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
106+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
105107
<orderEntry type="sourceFolder" forTests="false" />
106-
<orderEntry type="library" exported="" name="floatingactionbutton-1.9.0" level="project" />
108+
<orderEntry type="library" exported="" name="design-22.2.1" level="project" />
107109
<orderEntry type="library" exported="" name="zipsigner-lib-1.17" level="project" />
108110
<orderEntry type="library" exported="" name="zipsigner-lib-optional-1.16" level="project" />
109111
<orderEntry type="library" exported="" name="crashlytics-core-2.3.1" level="project" />
110112
<orderEntry type="library" exported="" name="answers-1.2.1" level="project" />
111113
<orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
112114
<orderEntry type="library" exported="" name="kellinwood-logging-log4j-1.0" level="project" />
113115
<orderEntry type="library" exported="" name="pkix-1.51.0.0" level="project" />
114-
<orderEntry type="library" exported="" name="material-dialogs-0.7.4.2" level="project" />
116+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
115117
<orderEntry type="library" exported="" name="fabric-1.3.2" level="project" />
116118
<orderEntry type="library" exported="" name="core-1.51.0.0" level="project" />
117119
<orderEntry type="library" exported="" name="prov-1.51.0.0" level="project" />
118120
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
119-
<orderEntry type="library" exported="" name="recyclerview-v7-22.1.1" level="project" />
120121
<orderEntry type="library" exported="" name="library-2.4.1" level="project" />
121122
<orderEntry type="library" exported="" name="library-1.0.1" level="project" />
123+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
124+
<orderEntry type="library" exported="" name="bottomsheet-1.2.0" level="project" />
125+
<orderEntry type="library" exported="" name="core-0.8.5.3" level="project" />
122126
<orderEntry type="library" exported="" name="kellinwood-logging-lib-1.1" level="project" />
123127
<orderEntry type="library" exported="" name="kellinwood-logging-android-1.4" level="project" />
124-
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
125-
<orderEntry type="library" exported="" name="bottomsheet-1.1.1" level="project" />
126-
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
127128
<orderEntry type="library" exported="" name="beta-1.1.2" level="project" />
129+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
130+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
128131
<orderEntry type="library" exported="" name="library-1.1.3" level="project" />
132+
<orderEntry type="library" exported="" name="commons-0.8.5.3" level="project" />
129133
<orderEntry type="library" exported="" name="zipio-lib-1.8" level="project" />
130134
<orderEntry type="library" exported="" name="crashlytics-2.3.1" level="project" />
131-
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
135+
<orderEntry type="library" exported="" name="library-1.1.4" level="project" />
132136
</component>
133137
</module>

‎source-code/app/build.gradle‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
dependencies {
7-
classpath 'io.fabric.tools:gradle:1.+'
7+
classpath 'io.fabric.tools:gradle:1.19.2'
88
}
99
}
1010
apply plugin: 'com.android.application'
@@ -24,12 +24,12 @@ android {
2424
storePassword 'buildmlearn'
2525
}
2626
}
27-
compileSdkVersion 22
28-
buildToolsVersion "21.1.2"
27+
compileSdkVersion 23
28+
buildToolsVersion '23.0.2'
2929
defaultConfig {
3030
applicationId "org.buildmlearn.toolkit"
3131
minSdkVersion 14
32-
targetSdkVersion 22
32+
targetSdkVersion 23
3333
versionCode 1
3434
versionName "1.0"
3535
}
@@ -49,8 +49,13 @@ dependencies {
4949
compile 'com.android.support:appcompat-v7:22.1.+'
5050
compile 'com.android.support:cardview-v7:21.0.+'
5151
compile 'com.android.support:recyclerview-v7:21.0.+'
52-
compile 'com.getbase:floatingactionbutton:1.9.0'
53-
compile 'com.afollestad:material-dialogs:0.7.4.2'
52+
compile 'com.android.support:design:22.2.1'
53+
compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') {
54+
transitive = true
55+
}
56+
compile('com.github.afollestad.material-dialogs:commons:0.8.5.3@aar') {
57+
transitive = true
58+
}
5459
compile 'com.cocosw:bottomsheet:1.+@aar'
5560
compile('com.crashlytics.sdk.android:crashlytics:2.3.1@aar') {
5661
transitive = true;

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<activity
2020
android:name=".activity.HomeActivity"
2121
android:label="@string/app_name"
22-
android:theme="@style/AppTheme.NoActionBar" >
22+
android:theme="@style/NoActionBarThemeTransparentStatusBar" >
2323
</activity>
2424
<activity
2525
android:name=".simulator.Simulator"
@@ -86,14 +86,6 @@
8686
<data android:pathPattern=".*\\.buildmlearn" />
8787
</intent-filter>
8888
</activity>
89-
<activity
90-
android:name=".activity.UploadActivity"
91-
android:label="@string/title_activity_upload"
92-
android:parentActivityName=".activity.TemplateEditor" >
93-
<meta-data
94-
android:name="android.support.PARENT_ACTIVITY"
95-
android:value="org.buildmlearn.toolkit.activity.TemplateEditor" />
96-
</activity>
9789
</application>
9890

9991
</manifest>

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.DialogInterface;
55
import android.content.Intent;
66
import android.content.SharedPreferences;
7+
import android.content.res.ColorStateList;
78
import android.graphics.drawable.ColorDrawable;
89
import android.net.Uri;
910
import android.os.Build;
@@ -25,7 +26,7 @@
2526

2627
import com.afollestad.materialdialogs.DialogAction;
2728
import com.afollestad.materialdialogs.MaterialDialog;
28-
import com.afollestad.materialdialogs.ThemeSingleton;
29+
import com.afollestad.materialdialogs.internal.ThemeSingleton;
2930
import com.cocosw.bottomsheet.BottomSheet;
3031

3132
import org.buildmlearn.toolkit.R;
@@ -442,9 +443,9 @@ public void changeColorScheme() {
442443
int primaryColor = getResources().getColor(R.color.color_primary_dark);
443444
int primaryColorDark = getResources().getColor(R.color.color_selected_dark);
444445
getSupportActionBar().setBackgroundDrawable(new ColorDrawable(primaryColor));
445-
ThemeSingleton.get().positiveColor = primaryColor;
446-
ThemeSingleton.get().neutralColor = primaryColor;
447-
ThemeSingleton.get().negativeColor = primaryColor;
446+
ThemeSingleton.get().positiveColor = ColorStateList.valueOf(primaryColor);
447+
ThemeSingleton.get().neutralColor = ColorStateList.valueOf(primaryColor);
448+
ThemeSingleton.get().negativeColor = ColorStateList.valueOf(primaryColor);
448449
ThemeSingleton.get().widgetColor = primaryColor;
449450
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
450451
getWindow().setStatusBarColor(primaryColorDark);
@@ -464,9 +465,9 @@ public void restoreColorScheme() {
464465
int primaryColor = getResources().getColor(R.color.color_primary);
465466
int primaryColorDark = getResources().getColor(R.color.color_primary_dark);
466467
getSupportActionBar().setBackgroundDrawable(new ColorDrawable(primaryColor));
467-
ThemeSingleton.get().positiveColor = primaryColor;
468-
ThemeSingleton.get().neutralColor = primaryColor;
469-
ThemeSingleton.get().negativeColor = primaryColor;
468+
ThemeSingleton.get().positiveColor = ColorStateList.valueOf(primaryColor);
469+
ThemeSingleton.get().neutralColor = ColorStateList.valueOf(primaryColor);
470+
ThemeSingleton.get().negativeColor = ColorStateList.valueOf(primaryColor);
470471
ThemeSingleton.get().widgetColor = primaryColor;
471472
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
472473
getWindow().setStatusBarColor(primaryColorDark);

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

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/NavigationDrawerFragment.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,19 @@ public void onActivityCreated(Bundle savedInstanceState) {
9999
super.onActivityCreated(savedInstanceState);
100100
// Indicate that this fragment would like to influence the set of actions in the action bar.
101101
setHasOptionsMenu(true);
102+
103+
setLayoutParamsForListView();
104+
}
105+
106+
private void setLayoutParamsForListView() {
107+
int deviceWidth = getResources().getDisplayMetrics().widthPixels;
108+
int dimen56 = getResources().getDimensionPixelSize(R.dimen.material_navigation_drawer_right_margin);
109+
int widthOfNavDrawer = deviceWidth - dimen56;
110+
if (widthOfNavDrawer > 5 * dimen56)
111+
widthOfNavDrawer = 5 * dimen56;
112+
ViewGroup.LayoutParams params = mDrawerListView.getLayoutParams();
113+
params.width = widthOfNavDrawer;
114+
mDrawerListView.setLayoutParams(params);
102115
}
103116

104117
/**

‎source-code/app/src/main/java/org/buildmlearn/toolkit/templates/FlashCardAdapter.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.afollestad.materialdialogs.MaterialDialog;
1414

1515
import org.buildmlearn.toolkit.R;
16+
import org.buildmlearn.toolkit.activity.TemplateEditor;
1617
import org.buildmlearn.toolkit.views.TextViewPlus;
1718

1819
import java.util.ArrayList;
@@ -101,6 +102,8 @@ public void onClick(View v) {
101102
mData.remove(position);
102103
notifyDataSetChanged();
103104
dialog.dismiss();
105+
106+
((TemplateEditor) mContext).restoreSelectedView();
104107
}
105108
});
106109

‎source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoAdapter.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
import com.afollestad.materialdialogs.MaterialDialog;
1313

1414
import org.buildmlearn.toolkit.R;
15+
import org.buildmlearn.toolkit.activity.TemplateEditor;
1516
import org.buildmlearn.toolkit.views.TextViewPlus;
1617

1718
import java.util.ArrayList;
1819

1920
/**
2021
* @brief Adapter for displaying Info Template Editor data.
21-
*
22+
* <p/>
2223
* Created by abhishek on 17/06/15 at 9:48 PM.
2324
*/
2425
public class InfoAdapter extends BaseAdapter {
@@ -86,6 +87,8 @@ public void onClick(View v) {
8687
data.remove(position);
8788
notifyDataSetChanged();
8889
dialog.dismiss();
90+
91+
((TemplateEditor) mContext).restoreSelectedView();
8992
}
9093
});
9194

‎source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingAdapter.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.afollestad.materialdialogs.MaterialDialog;
1313

1414
import org.buildmlearn.toolkit.R;
15+
import org.buildmlearn.toolkit.activity.TemplateEditor;
1516
import org.buildmlearn.toolkit.views.TextViewPlus;
1617

1718
import java.util.ArrayList;
@@ -86,6 +87,8 @@ public void onClick(View v) {
8687
data.remove(position);
8788
notifyDataSetChanged();
8889
dialog.dismiss();
90+
91+
((TemplateEditor) mContext).restoreSelectedView();
8992
}
9093
});
9194

0 commit comments

Comments
 (0)