Project

General

Profile

« Previous | Next » 

Revision a47ee432

Added by Leszek Koltunski over 6 years ago

rename 'credits' to 'settings'

View differences:

src/main/java/org/distorted/magic/RubikActivity.java
120 120 

  		




  121
  121
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  122
  122
  
    

  		




  123
  
  
    
    public void Credits(View v)


  		




  
  123
  
    
    public void Settings(View v)


  		




  124
  124
  
    
      {


  		




  125
  
  
    
      android.util.Log.e("rubik", "credits...");


  		




  
  125
  
    
      android.util.Log.e("rubik", "settings...");


  		




  126
  126
  
    
      }


  		




  127
  127
  
    

  		




  128
  128
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












  

    
      src/main/res/layout/layout.xml
    
  





  11
  11
  
    
        android:gravity="center|fill_horizontal" >


  		




  12
  12
  
    

  		




  13
  13
  
    
         <Button


  		




  14
  
  
    
            android:id="@+id/rubikCredits"


  		




  
  14
  
    
            android:id="@+id/rubikSettings"


  		




  15
  15
  
    
            android:layout_width="wrap_content"


  		




  16
  16
  
    
            android:layout_height="64dp"


  		




  17
  17
  
    
            android:layout_weight="0.5"


  		




  18
  
  
    
            android:onClick="Credits"


  		




  
  18
  
    
            android:onClick="Settings"


  		




  19
  19
  
    
            android:paddingLeft="5dp"


  		




  20
  20
  
    
            android:paddingRight="5dp"


  		




  21
  
  
    
            android:text="@string/credits" />


  		




  
  21
  
    
            android:text="@string/settings" />


  		




  22
  22
  
    

  		




  23
  23
  
    
        <ImageButton


  		




  24
  24
  
    
            android:id="@+id/rubikSize2"


  		












  

    
      src/main/res/values/strings.xml
    
  





  1
  1
  
    
<resources>


  		




  2
  2
  
    
    <string name="app_name">Magic Cube</string>


  		




  3
  3
  
    
    <string name="scramble">Scramble</string>


  		




  4
  
  
    
    <string name="credits">Credits</string>


  		




  
  4
  
    
    <string name="settings">Settings</string>


  		




  5
  5
  
    
</resources>


  		












Also available in:  Unified diff