Project

General

Profile

« Previous | Next » 

Revision 8bf6f34c

Added by Leszek Koltunski about 1 year ago

Fix the for dialog layouts!

View differences:

src/main/java/org/distorted/dialogs/RubikDialogSolverView.java
30 30

  
31 31
///////////////////////////////////////////////////////////////////////////////////////////////////
32 32

  
33
  public RubikDialogSolverView(final RubikActivity act, final RubikDialogSolvers dialog, final int index, int object, int title, int desc, int padding, int fontSize,
34
                               LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt )
33
  public RubikDialogSolverView(final RubikActivity act, final RubikDialogSolvers dialog, int index, int object,
34
                               int title, int desc, int padding, int fontSize, LinearLayout.LayoutParams pView,
35
                               LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt )
35 36
    {
36 37
    mView = act.getLayoutInflater().inflate(R.layout.dialog_solvers_pane, null);
37 38
    mView.setLayoutParams(pView);
src/main/java/org/distorted/dialogs/RubikDialogSolvers.java
43 43

  
44 44
///////////////////////////////////////////////////////////////////////////////////////////////////
45 45

  
46
  public int getResource()      { return R.layout.dialog_scrollable_panes; }
47
  public int getTitleResource() { return R.string.solver; }
48
  public boolean hasArgument()  { return false; }
49
  public int getPositive()      { return R.string.ok; }
50
  public int getNegative()      { return -1; }
51

  
52
///////////////////////////////////////////////////////////////////////////////////////////////////
53

  
54
  public void positiveAction()
55
    {
56

  
57
    }
58

  
59
///////////////////////////////////////////////////////////////////////////////////////////////////
60

  
61
  public void negativeAction()
62
    {
63

  
64
    }
46
  public int getResource()            { return R.layout.dialog_scrollable_panes; }
47
  public int getTitleResource()       { return R.string.solver; }
48
  public boolean hasArgument()        { return false; }
49
  public int getPositive()            { return R.string.ok; }
50
  public int getNegative()            { return -1; }
51
  public static String getDialogTag() { return "DialogSolvers"; }
52
  public void positiveAction()        { }
53
  public void negativeAction()        { }
65 54

  
66 55
///////////////////////////////////////////////////////////////////////////////////////////////////
67 56

  
......
97 86
      layout.addView(pane.getView());
98 87
      }
99 88
    }
100

  
101
///////////////////////////////////////////////////////////////////////////////////////////////////
102

  
103
  public static String getDialogTag()
104
    {
105
    return "DialogSolvers";
106
    }
107 89
  }
src/main/java/org/distorted/dialogs/RubikDialogUpdates.java
54 54

  
55 55
///////////////////////////////////////////////////////////////////////////////////////////////////
56 56

  
57
  public int getResource()      { return R.layout.dialog_scrollable_panes; }
58
  public int getTitleResource() { return R.string.updates; }
59
  public boolean hasArgument()  { return false; }
60
  public int getPositive()      { return R.string.ok; }
61
  public int getNegative()      { return -1; }
62

  
63
///////////////////////////////////////////////////////////////////////////////////////////////////
64

  
65
  public void positiveAction()
66
    {
67

  
68
    }
69

  
70
///////////////////////////////////////////////////////////////////////////////////////////////////
71

  
72
  public void negativeAction()
73
    {
74

  
75
    }
57
  public int getResource()            { return R.layout.dialog_scrollable_panes; }
58
  public int getTitleResource()       { return R.string.updates; }
59
  public boolean hasArgument()        { return false; }
60
  public int getPositive()            { return R.string.ok; }
61
  public int getNegative()            { return -1; }
62
  public void positiveAction()        { }
63
  public void negativeAction()        { }
64
  public static String getDialogTag() { return "DialogUpdates"; }
76 65

  
77 66
///////////////////////////////////////////////////////////////////////////////////////////////////
78 67

  
......
200 189
        });
201 190
      }
202 191
    }
203

  
204
///////////////////////////////////////////////////////////////////////////////////////////////////
205

  
206
  public static String getDialogTag()
207
    {
208
    return "DialogUpdates";
209
    }
210 192
  }
src/main/res/layout/dialog_creators_pane.xml
10 10
    <ImageView
11 11
   	     android:id="@+id/creators_pane_image"
12 12
   	     android:scaleType="fitCenter"
13
		 android:adjustViewBounds="true"
13 14
   		 android:layout_width="0dp"
14 15
   		 android:layout_height="match_parent"
15 16
   		 android:layout_gravity="top"
src/main/res/layout/dialog_solvers_pane.xml
10 10
    <ImageView
11 11
   	     android:id="@+id/solvers_pane_image"
12 12
   	     android:scaleType="fitCenter"
13
		 android:adjustViewBounds="true"
13 14
   		 android:layout_width="0dp"
14 15
   		 android:layout_height="match_parent"
15 16
   		 android:layout_gravity="top"

Also available in: Unified diff