Revision 41aff64e
Added by Leszek Koltunski 3 days ago
| src/main/res/layout/mainlayout.xml | ||
|---|---|---|
| 24 | 24 |
android:id="@+id/solverReset" |
| 25 | 25 |
android:layout_width="0dp" |
| 26 | 26 |
android:layout_height="match_parent" |
| 27 |
android:layout_weight="1.0"
|
|
| 27 |
android:layout_weight="0.9"
|
|
| 28 | 28 |
android:gravity="center_vertical|center" |
| 29 | 29 |
android:text="@string/reset" |
| 30 | 30 |
android:onClick="Reset" |
| ... | ... | |
| 46 | 46 |
android:id="@+id/solverSolve" |
| 47 | 47 |
android:layout_width="0dp" |
| 48 | 48 |
android:layout_height="match_parent" |
| 49 |
android:layout_weight="1.0"
|
|
| 49 |
android:layout_weight="0.9"
|
|
| 50 | 50 |
android:gravity="center_vertical|center" |
| 51 | 51 |
android:text="@string/solve" |
| 52 | 52 |
android:onClick="Solve" |
| 53 | 53 |
android:textAppearance="?android:attr/textAppearanceMedium" |
| 54 | 54 |
android:layout_gravity="center_vertical"/> |
| 55 |
|
|
| 56 |
</LinearLayout> |
|
| 57 |
|
|
| 58 |
<LinearLayout |
|
| 59 |
android:id="@+id/middleBar" |
|
| 60 |
android:layout_below="@id/upperBar" |
|
| 61 |
android:layout_width="match_parent" |
|
| 62 |
android:layout_height="50dp" |
|
| 63 |
android:gravity="center" |
|
| 64 |
android:orientation="horizontal" |
|
| 65 |
android:background="@android:color/transparent"> |
|
| 66 |
|
|
| 67 |
<TextView |
|
| 68 |
android:id="@+id/solverMoves" |
|
| 69 |
android:layout_width="0dp" |
|
| 70 |
android:layout_height="match_parent" |
|
| 71 |
android:layout_weight="2" |
|
| 72 |
android:background="@color/white" |
|
| 73 |
android:textColor="@color/black" |
|
| 74 |
android:layout_marginStart="4dp" |
|
| 75 |
android:layout_marginEnd="4dp" |
|
| 76 |
android:layout_marginTop="3dp" |
|
| 77 |
android:layout_marginBottom="5dp" |
|
| 78 |
android:textAppearance="?android:attr/textAppearanceLarge" |
|
| 79 |
android:gravity="center_vertical|start"/> |
|
| 80 | 55 |
<Spinner |
| 81 | 56 |
android:id="@+id/solverSpinner" |
| 82 | 57 |
android:layout_width="0dp" |
| 83 | 58 |
android:layout_height="match_parent" |
| 84 |
android:layout_weight="1"/> |
|
| 85 |
|
|
| 59 |
android:layout_weight="1.0"/> |
|
| 86 | 60 |
</LinearLayout> |
| 87 | 61 |
|
| 62 |
<TextView |
|
| 63 |
android:id="@+id/solverMoves" |
|
| 64 |
android:layout_below="@id/upperBar" |
|
| 65 |
android:layout_width="match_parent" |
|
| 66 |
android:layout_height="50dp" |
|
| 67 |
android:singleLine="true" |
|
| 68 |
android:background="@color/white" |
|
| 69 |
android:textColor="@color/black" |
|
| 70 |
android:layout_marginStart="3dp" |
|
| 71 |
android:layout_marginEnd="3dp" |
|
| 72 |
android:layout_marginTop="3dp" |
|
| 73 |
android:layout_marginBottom="5dp" |
|
| 74 |
android:textAppearance="?android:attr/textAppearanceLarge" |
|
| 75 |
android:gravity="center_vertical|start"/> |
|
| 76 |
|
|
| 77 |
<TextView |
|
| 78 |
android:id="@+id/solverStickers" |
|
| 79 |
android:layout_below="@id/solverMoves" |
|
| 80 |
android:layout_width="match_parent" |
|
| 81 |
android:layout_height="50dp" |
|
| 82 |
android:singleLine="true" |
|
| 83 |
android:background="@color/white" |
|
| 84 |
android:textColor="@color/black" |
|
| 85 |
android:layout_marginStart="3dp" |
|
| 86 |
android:layout_marginEnd="3dp" |
|
| 87 |
android:layout_marginTop="3dp" |
|
| 88 |
android:layout_marginBottom="5dp" |
|
| 89 |
android:textAppearance="?android:attr/textAppearanceLarge" |
|
| 90 |
android:gravity="center_vertical|start"/> |
|
| 91 |
|
|
| 88 | 92 |
<LinearLayout |
| 89 | 93 |
android:id="@+id/phaseBar" |
| 90 | 94 |
android:layout_above="@id/lowerBar" |
Also available in: Unified diff
change one of objlib's APIs from 'onReplaceModeUP/Down' (which only comes when TouchControl is in REPLACE mode) to 'onStickerTouched/Untouched' (which reports the same thing, but comes always)