-
Notifications
You must be signed in to change notification settings - Fork 296
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #437 from Countly/staging
Staging 7.7
- Loading branch information
Showing
20 changed files
with
364 additions
and
192 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,124 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:orientation="vertical" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:gravity="center_vertical" | ||
| android:paddingLeft="@dimen/activity_horizontal_margin" | ||
| android:paddingRight="@dimen/activity_horizontal_margin" | ||
| android:paddingTop="@dimen/activity_vertical_margin" | ||
| android:paddingBottom="@dimen/activity_vertical_margin" | ||
| > | ||
|
|
||
| <Button | ||
| android:id="@+id/button42" | ||
| android:orientation="vertical" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:gravity="center_vertical" | ||
| android:paddingLeft="@dimen/activity_horizontal_margin" | ||
| android:paddingRight="@dimen/activity_horizontal_margin" | ||
| android:paddingTop="@dimen/activity_vertical_margin" | ||
| android:paddingBottom="@dimen/activity_vertical_margin" | ||
| > | ||
| <ScrollView | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickViewOther02" | ||
| android:text="@string/ask_for_star_rating" | ||
| android:layout_height="match_parent" | ||
| > | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:gravity="center_vertical" | ||
| android:layout_gravity="center_vertical" | ||
| > | ||
| <Button | ||
| android:id="@+id/button42" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickViewOther02" | ||
| android:text="@string/ask_for_star_rating" | ||
| /> | ||
|
|
||
| <Button | ||
| android:id="@+id/button46" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickViewOther07" | ||
| android:text="@string/ask_for_rating_widget" | ||
| <Button | ||
| android:id="@+id/button46" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickViewOther07" | ||
| android:text="@string/ask_for_rating_widget" | ||
| /> | ||
|
|
||
| <Button | ||
| android:id="@+id/button71" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickSendManualRating" | ||
| android:text="Send Manual Rating" | ||
| <Button | ||
| android:id="@+id/button71" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickSendManualRating" | ||
| android:text="Send Manual Rating" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button63" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowSurvey" | ||
| android:text="Show survey" | ||
| <Button | ||
| android:id="@+id/presentNPS" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" android:text="Present nps"/> | ||
| <Button | ||
| android:id="@+id/presentSurvey" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" android:text="present survey"/> | ||
| <Button | ||
| android:id="@+id/presentRating" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" android:text="present rating"/> | ||
| <Button | ||
| android:id="@+id/btnAvailableWidgets" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowAvailableFeedbackWidgets" | ||
| android:text="Available feedback widgets" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button69" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowNPS" | ||
| android:text="Show NPS" | ||
| <Button | ||
| android:id="@+id/button61" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickReportSurveyManually" | ||
| android:text="Report Survey Manually" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button37" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowRating" | ||
| android:text="show rating" | ||
| <Button | ||
| android:id="@+id/button38" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickReportRatingManually" | ||
| android:text="Report Rating Manually" | ||
| /> | ||
| <Button | ||
| android:id="@+id/btnAvailableWidgets" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowAvailableFeedbackWidgets" | ||
| android:text="Available feedback widgets" | ||
| <Button | ||
| android:id="@+id/button62" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickReportNPSManually" | ||
| android:text="Report NPS manually" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button61" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickReportSurveyManually" | ||
| android:text="Report Survey Manually" | ||
| <Button | ||
| android:id="@+id/button63" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowSurvey" | ||
| android:text="Show survey" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button38" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickReportRatingManually" | ||
| android:text="Report Rating Manually" | ||
| <Button | ||
| android:id="@+id/button69" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowNPS" | ||
| android:text="Show NPS" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button62" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickReportNPSManually" | ||
| android:text="Report NPS manually" | ||
| <Button | ||
| android:id="@+id/button37" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickShowRating" | ||
| android:text="show rating" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button34" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickRetrieveSurveyDataManually" | ||
| android:text="Retrieve survey data manually" | ||
| <Button | ||
| android:id="@+id/button34" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickRetrieveSurveyDataManually" | ||
| android:text="Retrieve survey data manually" | ||
| /> | ||
| <Button | ||
| android:id="@+id/button35" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickRetrieveNPSDataManually" | ||
| android:text="Retrieve nps data manually" | ||
| <Button | ||
| android:id="@+id/button35" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:onClick="onClickRetrieveNPSDataManually" | ||
| android:text="Retrieve nps data manually" | ||
| /> | ||
|
|
||
| </LinearLayout> | ||
| </ScrollView> | ||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.