Skip to content

Commit

Permalink
UI code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Tina authored and Tina committed Jul 26, 2017
1 parent a69013b commit 2f9a389
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public void onClick(DialogInterface dialog, int id) {
}
}


public static class ColorDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
Expand All @@ -96,6 +95,5 @@ public void onClick(DialogInterface dialog, int index) {
return builder.create();
}
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,4 @@ public void onClick(DialogInterface dialog, int id) {
return builder.create();
}
}


}
Binary file modified app/src/main/res/drawable/analytics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/build.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/crashes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/distribute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/mclogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/push.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/test.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions app/src/main/res/layout/analytics_root.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/colorAnalyticsBackground">
android:background="@color/colorAnalyticsBackground"
android:orientation="vertical">

<Button
android:id="@+id/customEventButton"
Expand Down Expand Up @@ -48,17 +48,17 @@
android:id="@+id/analyticsTextView"
android:layout_width="300dp"
android:layout_height="110dp"
android:layout_alignLeft="@+id/customEventButton"
android:layout_alignStart="@+id/customEventButton"
android:layout_below="@+id/analyticsImageView"
android:layout_marginTop="24dp"
android:clickable="false"
android:contextClickable="false"
android:cursorVisible="false"
android:defaultFocusHighlightEnabled="false"
android:fadeScrollbars="false"
android:textSize="17sp"
android:text="@string/analytics_description"
android:textAppearance="@style/TextAppearance.AppCompat"
android:layout_below="@+id/analyticsImageView"
android:layout_alignLeft="@+id/customEventButton"
android:layout_alignStart="@+id/customEventButton"
android:layout_marginTop="24dp" />
android:textSize="17sp" />

</RelativeLayout>
7 changes: 4 additions & 3 deletions app/src/main/res/layout/build_root.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBuildBackground">

<ImageView
Expand Down Expand Up @@ -32,7 +33,7 @@
android:fadeScrollbars="false"
android:text="@string/build_description"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="17sp"
android:textColor="@android:color/white"/>
android:textColor="@android:color/white"
android:textSize="17sp" />

</RelativeLayout>
16 changes: 8 additions & 8 deletions app/src/main/res/layout/crashes_root.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
android:id="@+id/crashButton"
android:layout_width="300dp"
android:layout_height="55dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="39dp"
android:backgroundTint="@android:color/white"
android:text="@string/crashes_crashButton"
android:textAllCaps="false"
android:textSize="17sp"
android:textStyle="normal"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" />
android:textStyle="normal" />

<ImageView
android:id="@+id/analyticsImageView"
Expand All @@ -34,18 +34,18 @@
android:id="@+id/crashesTextView"
android:layout_width="300dp"
android:layout_height="140dp"
android:layout_alignLeft="@+id/crashButton"
android:layout_alignStart="@+id/crashButton"
android:layout_below="@+id/analyticsImageView"
android:layout_marginTop="26dp"
android:clickable="false"
android:contextClickable="false"
android:cursorVisible="false"
android:defaultFocusHighlightEnabled="false"
android:fadeScrollbars="false"
android:text="@string/crashes_description"
android:textColor="@android:color/white"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="17sp"
android:layout_below="@+id/analyticsImageView"
android:layout_alignLeft="@+id/crashButton"
android:layout_alignStart="@+id/crashButton" />
android:textColor="@android:color/white"
android:textSize="17sp" />

</RelativeLayout>
11 changes: 6 additions & 5 deletions app/src/main/res/layout/distribute_root.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorDistributeBackground">

<ImageView
android:id="@+id/distributeImageView"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:adjustViewBounds="true"
android:background="@color/colorDistributeImageBackground"
android:scaleType="fitCenter"
app:srcCompat="@drawable/distribute"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
app:srcCompat="@drawable/distribute" />

<TextView
android:id="@+id/distributeTextView"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/push_root.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPushBackground">

<ImageView
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/test_root.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorTestBackground">

<ImageView
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/welcome_root.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorWelcomeBackground">

<ImageView
Expand Down

0 comments on commit 2f9a389

Please sign in to comment.