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

Fix part of #135: UI Structure:Topic player multiple tabs #230

Merged
merged 73 commits into from
Nov 6, 2019
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
e2ed1c4
multiple tabs
nikitamarysolomanpvt Oct 7, 2019
089ea5a
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
nikitamarysolomanpvt Oct 14, 2019
43016b6
nit changes
nikitamarysolomanpvt Oct 17, 2019
3a1a350
nit changes
nikitamarysolomanpvt Oct 17, 2019
405a45e
nit changes
nikitamarysolomanpvt Oct 17, 2019
72c7360
nit changes
nikitamarysolomanpvt Oct 17, 2019
c5ffa61
nit changes
nikitamarysolomanpvt Oct 17, 2019
47e2efc
nit changes
nikitamarysolomanpvt Oct 17, 2019
b4ed9bb
nit changes
nikitamarysolomanpvt Oct 17, 2019
9dd39b9
nit changes
nikitamarysolomanpvt Oct 17, 2019
b2fca59
nit changes
nikitamarysolomanpvt Oct 17, 2019
f0cb60f
cust_args
nikitamarysolomanpvt Oct 18, 2019
2d21695
multiple tabs will getting topic id from home
nikitamarysolomanpvt Oct 29, 2019
93b889b
test cases,multiple tabs will getting topic id from home
nikitamarysolomanpvt Oct 29, 2019
3130323
nit
nikitamarysolomanpvt Oct 29, 2019
bbe7cf3
nit
nikitamarysolomanpvt Oct 29, 2019
046e297
nit
nikitamarysolomanpvt Oct 30, 2019
ba506ab
nit
nikitamarysolomanpvt Oct 30, 2019
6f228d1
nit
nikitamarysolomanpvt Oct 30, 2019
24be11b
separate test cases for all four tabs
nikitamarysolomanpvt Oct 30, 2019
bfa2b78
nit
nikitamarysolomanpvt Oct 30, 2019
0c6d5d8
nit
nikitamarysolomanpvt Oct 30, 2019
f8f84f1
nit
nikitamarysolomanpvt Oct 30, 2019
efae9f7
nit
nikitamarysolomanpvt Oct 30, 2019
1ecfc2f
nit
nikitamarysolomanpvt Oct 30, 2019
293aa52
nit
nikitamarysolomanpvt Oct 30, 2019
949f89e
nit
nikitamarysolomanpvt Oct 30, 2019
71ae233
nit
nikitamarysolomanpvt Oct 30, 2019
b4b7763
nit
nikitamarysolomanpvt Oct 31, 2019
8c67e7e
nit
nikitamarysolomanpvt Oct 31, 2019
f4451ea
merged with develop
nikitamarysolomanpvt Oct 31, 2019
a598fc7
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
nikitamarysolomanpvt Oct 31, 2019
e137f99
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
92a6b26
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
413b811
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
344e153
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
8545a66
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
2304174
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
d5041b9
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
4934518
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
3410a17
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
3e366b6
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
12da7e9
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
41903fb
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
2339b10
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
bd1949f
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
8599de6
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
edf1a95
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
f19daa8
revert back to develop
nikitamarysolomanpvt Oct 31, 2019
916ccc2
nit changes
nikitamarysolomanpvt Nov 2, 2019
758b7e6
nit changes
nikitamarysolomanpvt Nov 2, 2019
5b7312a
nit changes
nikitamarysolomanpvt Nov 2, 2019
33753cc
nit changes
nikitamarysolomanpvt Nov 4, 2019
89b274a
set title on the basis of selected topic in topic screen.other nit ch…
nikitamarysolomanpvt Nov 5, 2019
1827e95
nit
nikitamarysolomanpvt Nov 5, 2019
d21250e
Merge branches 'develop' and 'topic-player-multiple-tabs' of https://…
nikitamarysolomanpvt Nov 5, 2019
e0c6b06
Merge branches 'develop' and 'topic-player-multiple-tabs' of https://…
nikitamarysolomanpvt Nov 5, 2019
3230c2f
Merge branches 'develop' and 'topic-player-multiple-tabs' of https://…
nikitamarysolomanpvt Nov 5, 2019
9695194
nit
nikitamarysolomanpvt Nov 5, 2019
40e449e
nit
nikitamarysolomanpvt Nov 5, 2019
51350f2
nit
nikitamarysolomanpvt Nov 5, 2019
10593a7
nit
nikitamarysolomanpvt Nov 5, 2019
772f98c
Merge branches 'develop' and 'topic-player-multiple-tabs' of https://…
nikitamarysolomanpvt Nov 5, 2019
f6569ff
Merge branches 'develop' and 'topic-player-multiple-tabs' of https://…
nikitamarysolomanpvt Nov 5, 2019
bacebd2
nit in TopicFragmentPresenter changed var to val in line number 69
nikitamarysolomanpvt Nov 5, 2019
8cede53
shorten stackoverflow link,testcase method name change
nikitamarysolomanpvt Nov 5, 2019
61fe4d5
nit changes suggested by Rajat
nikitamarysolomanpvt Nov 5, 2019
83ad843
merged with develop
nikitamarysolomanpvt Nov 6, 2019
1aa955e
nit
nikitamarysolomanpvt Nov 6, 2019
ba16385
changes suggested by ben https://github.com/oppia/oppia-android/pull/…
nikitamarysolomanpvt Nov 6, 2019
236384f
nit
nikitamarysolomanpvt Nov 6, 2019
8d6454f
nit
nikitamarysolomanpvt Nov 6, 2019
898eadf
nit
nikitamarysolomanpvt Nov 6, 2019
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
Prev Previous commit
Next Next commit
nit changes
  • Loading branch information
nikitamarysolomanpvt committed Oct 17, 2019
commit 9dd39b983029e602b70dec3081d016d8afd37bc4
15 changes: 1 addition & 14 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,54 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="OppiaTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorPrimary</item>
</style>

<style name="OppiaThemeWithoutActionBar" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

<style name="SplashScreenTheme" parent="OppiaThemeWithoutActionBar">
<item name="android:windowBackground">@drawable/splash_page</item>
<item name="android:windowAnimationStyle">@style/FadeTransitionAnimation.Activity</item>
</style>

<!-- Base style for animations. This style specifies no animations. -->
<style name="FadeTransitionAnimation" />

<style name="FadeTransitionAnimation"/>
<!-- Standard animations for a full-screen window or activity. -->
<style name="FadeTransitionAnimation.Activity">
<item name="android:activityOpenEnterAnimation">@anim/fade_in</item>
<item name="android:activityOpenExitAnimation">@anim/fade_out</item>
</style>

<style name="FullScreenDialogStyle" parent="Theme.AppCompat.Dialog">
<item name="android:windowNoTitle">true</item>
<item name="colorPrimaryDark">@color/colorConceptToolbarHeading</item>

<!-- Set this to true if you want Full Screen without status bar -->
<item name="android:windowFullscreen">false</item>

<item name="android:windowIsFloating">false</item>

<!-- This is important! Don't forget to set window background -->
<item name="android:windowBackground">@color/colorConceptCardBackground</item>

<!-- Additionally if you want animations when dialog opening -->
<item name="android:windowEnterAnimation">@anim/slide_up</item>
<item name="android:windowExitAnimation">@anim/slide_down</item>
</style>
<style name="OppiaTheme.NoActionBar">
nikitamarysolomanpvt marked this conversation as resolved.
Show resolved Hide resolved
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>

</style>

<!-- STATE BUTTON ACTIVE STYLE -->
<style name="StateButtonActive" parent="TextAppearance.AppCompat.Widget.Button">
<item name="android:layout_width">wrap_content</item>
Expand All @@ -63,7 +51,6 @@
<item name="android:textSize">14sp</item>
<item name="android:clickable">true</item>
</style>

<!-- STATE BUTTON INACTIVE STYLE -->
<style name="StateButtonInactive" parent="TextAppearance.AppCompat.Widget.Button">
<item name="android:layout_width">wrap_content</item>
Expand Down