Project

General

Profile

« Previous | Next » 

Revision 66e777b0

Added by Leszek Koltunski over 4 years ago

Move to AndroidX, target API level 29.

View differences:

build.gradle
1 1 
apply plugin: 'com.android.application'
2 
apply plugin: 'com.google.gms.google-services'
2 3 

  		




  3
  4
  
    
android {


  		




  4
  
  
    
    compileSdkVersion 27


  		




  
  5
  
    
    compileSdkVersion 29


  		




  5
  6
  
    

  		




  6
  7
  
    
    defaultConfig {


  		




  7
  8
  
    
        applicationId "org.distorted.magic"


  		




  8
  9
  
    
        minSdkVersion 21


  		




  9
  
  
    
        targetSdkVersion 27


  		




  
  10
  
    
        targetSdkVersion 29


  		




  10
  11
  
    
        versionCode 1


  		




  11
  12
  
    
        versionName "1.0"


  		




  12
  13
  
    
    }


  		




  ......




  22
  23
  
    

  		




  23
  24
  
    
dependencies {


  		




  24
  25
  
    
    implementation fileTree(dir: 'libs', include: ['*.jar'])


  		




  
  26
  
    
    implementation 'com.google.firebase:firebase-analytics:17.3.0'


  		




  25
  27
  
    

  		




  26
  28
  
    
    api project(':distorted-library')


  		




  27
  
  
    
    implementation 'com.android.support:appcompat-v7:27.1.1'


  		




  28
  
  
    
    implementation 'com.android.support:design:27.1.1'


  		




  
  29
  
    
    implementation 'androidx.appcompat:appcompat:1.1.0'


  		




  
  30
  
    
    implementation 'com.google.android.material:material:1.1.0'


  		




  29
  31
  
    
}


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogAbout.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v7.app.AlertDialog;


  		




  28
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  28
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  29
  29
  
    
import android.view.LayoutInflater;


  		




  30
  30
  
    
import android.view.View;


  		




  31
  31
  
    
import android.view.Window;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogEffects.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v4.content.ContextCompat;


  		




  28
  
  
    
import android.support.v7.app.AlertDialog;


  		




  29
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.core.content.ContextCompat;


  		




  
  28
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  29
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  30
  30
  
    
import android.util.DisplayMetrics;


  		




  31
  31
  
    
import android.view.Gravity;


  		




  32
  32
  
    
import android.view.LayoutInflater;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogMain.java
    
  





  21
  21
  
    

  		




  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.os.Bundle;


  		




  24
  
  
    
import android.support.annotation.NonNull;


  		




  25
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  26
  
  
    
import android.support.v7.app.AlertDialog;


  		




  27
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  24
  
    
import androidx.annotation.NonNull;


  		




  
  25
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  26
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  27
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  28
  28
  
    
import android.view.LayoutInflater;


  		




  29
  29
  
    
import android.view.View;


  		




  30
  30
  
    
import android.view.Window;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogNewRecord.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v7.app.AlertDialog;


  		




  28
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  28
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  29
  29
  
    
import android.view.LayoutInflater;


  		




  30
  30
  
    
import android.view.View;


  		




  31
  31
  
    
import android.view.Window;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogPattern.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.Context;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v4.view.ViewPager;


  		




  28
  
  
    
import android.support.v7.app.AlertDialog;


  		




  29
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  30
  
  
    
import android.support.design.widget.TabLayout;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.viewpager.widget.ViewPager;


  		




  
  28
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  29
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  
  30
  
    
import com.google.android.material.tabs.TabLayout;


  		




  31
  31
  
    
import android.util.DisplayMetrics;


  		




  32
  32
  
    
import android.view.LayoutInflater;


  		




  33
  33
  
    
import android.view.View;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogPatternPagerAdapter.java
    
  





  19
  19
  
    

  		




  20
  20
  
    
package org.distorted.dialogs;


  		




  21
  21
  
    

  		




  22
  
  
    
import android.support.annotation.NonNull;


  		




  23
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  24
  
  
    
import android.support.v4.view.PagerAdapter;


  		




  25
  
  
    
import android.support.v4.view.ViewPager;


  		




  
  22
  
    
import androidx.annotation.NonNull;


  		




  
  23
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  24
  
    
import androidx.viewpager.widget.PagerAdapter;


  		




  
  25
  
    
import androidx.viewpager.widget.ViewPager;


  		




  26
  26
  
    
import android.view.View;


  		




  27
  27
  
    
import android.view.ViewGroup;


  		




  28
  28
  
    

  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogPatternView.java
    
  





  20
  20
  
    
package org.distorted.dialogs;


  		




  21
  21
  
    

  		




  22
  22
  
    
import android.content.Context;


  		




  23
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  
  23
  
    
import androidx.fragment.app.FragmentActivity;


  		




  24
  24
  
    
import android.util.AttributeSet;


  		




  25
  25
  
    
import android.util.DisplayMetrics;


  		




  26
  26
  
    
import android.view.View;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogScores.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v4.view.ViewPager;


  		




  28
  
  
    
import android.support.v7.app.AlertDialog;


  		




  29
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  30
  
  
    
import android.support.design.widget.TabLayout;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.viewpager.widget.ViewPager;


  		




  
  28
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  29
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  
  30
  
    
import com.google.android.material.tabs.TabLayout;


  		




  31
  31
  
    
import android.view.LayoutInflater;


  		




  32
  32
  
    
import android.view.View;


  		




  33
  33
  
    
import android.view.Window;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogScoresPagerAdapter.java
    
  





  20
  20
  
    
package org.distorted.dialogs;


  		




  21
  21
  
    

  		




  22
  22
  
    
import android.os.Bundle;


  		




  23
  
  
    
import android.support.annotation.NonNull;


  		




  24
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  25
  
  
    
import android.support.v4.view.PagerAdapter;


  		




  26
  
  
    
import android.support.v4.view.ViewPager;


  		




  
  23
  
    
import androidx.annotation.NonNull;


  		




  
  24
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  25
  
    
import androidx.viewpager.widget.PagerAdapter;


  		




  
  26
  
    
import androidx.viewpager.widget.ViewPager;


  		




  27
  27
  
    
import android.view.View;


  		




  28
  28
  
    
import android.view.ViewGroup;


  		




  29
  29
  
    
import android.widget.LinearLayout;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogScoresView.java
    
  





  21
  21
  
    

  		




  22
  22
  
    
import android.content.Context;


  		




  23
  23
  
    
import android.content.res.Resources;


  		




  24
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  
  24
  
    
import androidx.fragment.app.FragmentActivity;


  		




  25
  25
  
    
import android.util.AttributeSet;


  		




  26
  26
  
    
import android.view.View;


  		




  27
  27
  
    
import android.widget.FrameLayout;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogSetName.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v7.app.AlertDialog;


  		




  28
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  28
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  29
  29
  
    
import android.text.Editable;


  		




  30
  30
  
    
import android.text.TextWatcher;


  		




  31
  31
  
    
import android.view.LayoutInflater;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogSolved.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v7.app.AlertDialog;


  		




  28
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  28
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  29
  29
  
    
import android.view.LayoutInflater;


  		




  30
  30
  
    
import android.view.View;


  		




  31
  31
  
    
import android.view.Window;


  		












  

    
      src/main/java/org/distorted/dialogs/RubikDialogSolverError.java
    
  





  22
  22
  
    
import android.app.Dialog;


  		




  23
  23
  
    
import android.content.DialogInterface;


  		




  24
  24
  
    
import android.os.Bundle;


  		




  25
  
  
    
import android.support.annotation.NonNull;


  		




  26
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  27
  
  
    
import android.support.v7.app.AlertDialog;


  		




  28
  
  
    
import android.support.v7.app.AppCompatDialogFragment;


  		




  
  25
  
    
import androidx.annotation.NonNull;


  		




  
  26
  
    
import androidx.fragment.app.FragmentActivity;


  		




  
  27
  
    
import androidx.appcompat.app.AlertDialog;


  		




  
  28
  
    
import androidx.appcompat.app.AppCompatDialogFragment;


  		




  29
  29
  
    
import android.view.LayoutInflater;


  		




  30
  30
  
    
import android.view.View;


  		




  31
  31
  
    
import android.view.Window;


  		












  

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





  22
  22
  
    
import android.content.SharedPreferences;


  		




  23
  23
  
    
import android.os.Bundle;


  		




  24
  24
  
    
import android.preference.PreferenceManager;


  		




  25
  
  
    
import android.support.v7.app.AppCompatActivity;


  		




  
  25
  
    
import androidx.appcompat.app.AppCompatActivity;


  		




  26
  26
  
    
import android.view.View;


  		




  27
  27
  
    

  		




  28
  28
  
    
import org.distorted.dialogs.RubikDialogAbout;


  		












  

    
      src/main/java/org/distorted/scores/RubikScoresDownloader.java
    
  





  19
  19
  
    

  		




  20
  20
  
    
package org.distorted.scores;


  		




  21
  21
  
    

  		




  22
  
  
    
import android.support.v4.app.FragmentActivity;


  		




  
  22
  
    
import androidx.fragment.app.FragmentActivity;


  		




  23
  23
  
    

  		




  24
  24
  
    
import org.distorted.main.R;


  		




  25
  25
  
    
import org.distorted.objects.RubikObjectList;


  		












  

    
      src/main/java/org/distorted/states/RubikStateMain.java
    
  





  20
  20
  
    
package org.distorted.states;


  		




  21
  21
  
    

  		




  22
  22
  
    
import android.content.SharedPreferences;


  		




  23
  
  
    
import android.support.v4.app.FragmentManager;


  		




  
  23
  
    
import androidx.fragment.app.FragmentManager;


  		




  24
  24
  
    
import android.util.DisplayMetrics;


  		




  25
  25
  
    
import android.view.LayoutInflater;


  		




  26
  26
  
    
import android.view.View;


  		












  

    
      src/main/java/org/distorted/states/RubikStatePattern.java
    
  





  21
  21
  
    

  		




  22
  22
  
    
import android.content.SharedPreferences;


  		




  23
  23
  
    
import android.os.Bundle;


  		




  24
  
  
    
import android.support.v4.app.FragmentManager;


  		




  
  24
  
    
import androidx.fragment.app.FragmentManager;


  		




  25
  25
  
    
import android.util.DisplayMetrics;


  		




  26
  26
  
    
import android.view.Gravity;


  		




  27
  27
  
    
import android.view.LayoutInflater;


  		












  

    
      src/main/java/org/distorted/states/RubikStatePlay.java
    
  





  32
  32
  
    
import android.widget.ImageButton;


  		




  33
  33
  
    
import android.widget.LinearLayout;


  		




  34
  34
  
    
import android.widget.PopupWindow;


  		




  35
  
  
    
import android.support.v7.widget.AppCompatSpinner;


  		




  
  35
  
    
import androidx.appcompat.widget.AppCompatSpinner;


  		




  36
  36
  
    

  		




  37
  37
  
    
import org.distorted.main.R;


  		




  38
  38
  
    
import org.distorted.main.RubikActivity;


  		












  

    
      src/main/java/org/distorted/states/RubikStateSolver.java
    
  





  26
  26
  
    
import android.graphics.PorterDuff;


  		




  27
  27
  
    
import android.graphics.drawable.Drawable;


  		




  28
  28
  
    
import android.os.Bundle;


  		




  29
  
  
    
import android.support.v4.content.ContextCompat;


  		




  
  29
  
    
import androidx.core.content.ContextCompat;


  		




  30
  30
  
    
import android.util.DisplayMetrics;


  		




  31
  31
  
    
import android.view.View;


  		




  32
  32
  
    
import android.widget.Button;


  		












  

    
      src/main/res/layout/dialog_tabbed.xml
    
  





  5
  5
  
    
    android:layout_weight="1"


  		




  6
  6
  
    
    android:orientation="vertical" >


  		




  7
  7
  
    

  		




  8
  
  
    
    <android.support.design.widget.TabLayout


  		




  
  8
  
    
    <com.google.android.material.tabs.TabLayout


  		




  9
  9
  
    
        android:id="@+id/sliding_tabs"


  		




  10
  10
  
    
        android:layout_width="match_parent"


  		




  11
  11
  
    
        android:layout_height="32dp"


  		




  12
  12
  
    
        android:theme="@style/Theme.AppCompat.NoActionBar">


  		




  13
  
  
    
    </android.support.design.widget.TabLayout>


  		




  
  13
  
    
    </com.google.android.material.tabs.TabLayout>


  		




  14
  14
  
    

  		




  15
  
  
    
    <android.support.v4.view.ViewPager


  		




  
  15
  
    
    <androidx.viewpager.widget.ViewPager


  		




  16
  16
  
    
        android:id="@+id/viewpager"


  		




  17
  17
  
    
        android:layout_width="match_parent"


  		




  18
  18
  
    
        android:layout_height="0dp"


  		












Also available in:  Unified diff