Skip to content
Snippets Groups Projects
Commit aec0d5eb authored by Taco's avatar Taco
Browse files

migrate to androidx 


Signed-off-by: default avatarTaco <SkytkRSfan3895@gmail.com>
parent 7e236a3f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 48 additions and 39 deletions
app/build.gradle
+ 2
− 2
View file @ aec0d5eb
......@@ -30,6 +30,6 @@ android {
}
dependencies {
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
implementation 'androidx.core:core:1.1.0-alpha03'
}
app/src/main/java/org/xphnx/ameixa/activities/BaseActivity.java
+ 2
− 1
View file @ aec0d5eb
......@@ -2,11 +2,12 @@ package org.xphnx.ameixa.activities;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.WindowManager;
import org.xphnx.ameixa.R;
import androidx.appcompat.app.AppCompatActivity;
public abstract class BaseActivity extends AppCompatActivity {
@Override
......
app/src/main/java/org/xphnx/ameixa/activities/IconActivity.java
+ 9
− 8
View file @ aec0d5eb
......@@ -6,6 +6,7 @@ import android.view.Gravity;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ScrollView;
import org.xphnx.ameixa.R;
......@@ -32,14 +33,14 @@ public class IconActivity extends BaseActivity {
float scale = ScreenUtils.densityScale(getApplicationContext());
int margin = 16 * Math.round(scale);
LinearLayout.LayoutParams baseParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT);
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
LinearLayout.LayoutParams imageParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
LayoutParams baseParams = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT);
LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT);
LayoutParams containerParams = new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
LayoutParams imageParams = new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT, 1f);
ScrollView baseScroller = new ScrollView(this);
baseScroller.setLayoutParams(baseParams);
......
app/src/main/java/org/xphnx/ameixa/activities/LicenseActivity.java
+ 10
− 9
View file @ aec0d5eb
......@@ -6,6 +6,7 @@ import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView;
import org.xphnx.ameixa.R;
......@@ -20,22 +21,22 @@ public class LicenseActivity extends BaseActivity {
}
private void createLayout() {
LinearLayout.LayoutParams smallLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
LayoutParams smallLayoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT, 1f);
float scale = ScreenUtils.densityScale(getApplicationContext());
int padding = Math.round(64 * scale);
LinearLayout frameLayout = new LinearLayout(this);
frameLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT));
frameLayout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT));
frameLayout.setBackgroundColor(0xffffffff);
frameLayout.setGravity(Gravity.CENTER);
setContentView(frameLayout);
LinearLayout baseLayout = new LinearLayout(this);
baseLayout.setOrientation(LinearLayout.VERTICAL);
baseLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.MATCH_PARENT));
baseLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT));
baseLayout.setGravity(Gravity.START);
frameLayout.addView(baseLayout);
......@@ -48,8 +49,8 @@ public class LicenseActivity extends BaseActivity {
LinearLayout sourceClickLayout = new LinearLayout(this);
sourceClickLayout.setOrientation(LinearLayout.HORIZONTAL);
sourceClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
sourceClickLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT));
sourceClickLayout.setGravity(Gravity.CENTER);
sourceLayout.addView(sourceClickLayout);
sourceClickLayout.setOnClickListener(this::gplLink);
......@@ -71,7 +72,7 @@ public class LicenseActivity extends BaseActivity {
LinearLayout imgClickLayout = new LinearLayout(this);
imgClickLayout.setOrientation(LinearLayout.HORIZONTAL);
imgClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
imgClickLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
imgClickLayout.setGravity(Gravity.CENTER);
imgLayout.addView(imgClickLayout);
imgClickLayout.setOnClickListener(this::ccLink);
......
app/src/main/java/org/xphnx/ameixa/activities/MainActivity.java
+ 15
− 13
View file @ aec0d5eb
......@@ -4,18 +4,20 @@ import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView;
import org.xphnx.ameixa.R;
import org.xphnx.ameixa.utils.ImageUtils;
import org.xphnx.ameixa.utils.ScreenUtils;
import androidx.core.content.ContextCompat;
public class MainActivity extends BaseActivity {
@Override
......@@ -25,22 +27,22 @@ public class MainActivity extends BaseActivity {
}
private void createLayout() {
LinearLayout.LayoutParams smallLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
LayoutParams smallLayoutParams = new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT, 1f);
float scale = ScreenUtils.densityScale(getApplicationContext());
ViewGroup.LayoutParams buttonParams = new ViewGroup.LayoutParams(Math.round(48 * scale), Math.round(48 * scale));
LinearLayout frameLayout = new LinearLayout(this);
frameLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT));
frameLayout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT));
frameLayout.setBackgroundColor(getResources().getColor(R.color.colorLight));
frameLayout.setGravity(Gravity.CENTER);
setContentView(frameLayout);
LinearLayout baseLayout = new LinearLayout(this);
baseLayout.setOrientation(LinearLayout.VERTICAL);
baseLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.MATCH_PARENT));
baseLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT));
baseLayout.setGravity(Gravity.START);
frameLayout.addView(baseLayout);
......@@ -53,8 +55,8 @@ public class MainActivity extends BaseActivity {
LinearLayout iconClickLayout = new LinearLayout(this);
iconClickLayout.setOrientation(LinearLayout.HORIZONTAL);
iconClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
iconClickLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT));
iconClickLayout.setGravity(Gravity.CENTER);
iconLayout.addView(iconClickLayout);
iconClickLayout.setOnClickListener(this::iconActivity);
......@@ -83,8 +85,8 @@ public class MainActivity extends BaseActivity {
LinearLayout sourceClickLayout = new LinearLayout(this);
sourceClickLayout.setOrientation(LinearLayout.HORIZONTAL);
sourceClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
sourceClickLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT));
sourceClickLayout.setGravity(Gravity.CENTER);
sourceLayout.addView(sourceClickLayout);
sourceClickLayout.setOnClickListener(this::gitLink);
......@@ -113,8 +115,8 @@ public class MainActivity extends BaseActivity {
LinearLayout aboutClickLayout = new LinearLayout(this);
aboutClickLayout.setOrientation(LinearLayout.HORIZONTAL);
aboutClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
aboutClickLayout.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT));
aboutClickLayout.setGravity(Gravity.CENTER);
aboutLayout.addView(aboutClickLayout);
aboutClickLayout.setOnClickListener(this::licenseActivity);
......
app/src/main/java/org/xphnx/ameixa/utils/ImageUtils.java
+ 4
− 2
View file @ aec0d5eb
......@@ -3,13 +3,15 @@ package org.xphnx.ameixa.utils;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.BitmapFactory.Options;
import android.graphics.drawable.Drawable;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.view.View;
import android.widget.ImageView;
import org.xphnx.ameixa.async.BitmapLoadTask;
import androidx.core.graphics.drawable.DrawableCompat;
public class ImageUtils {
public static void bitmapLoadAsync(final ImageView imageView, final Resources resources,
......@@ -27,7 +29,7 @@ public class ImageUtils {
}
public static Bitmap bitmapLoad(Resources resources, int resId, int width, int height) {
BitmapFactory.Options resOptions = new BitmapFactory.Options();
Options resOptions = new Options();
resOptions.inJustDecodeBounds = true;
// load appropriately sampled bitmap from given resource
......
app/src/main/java/org/xphnx/ameixa/utils/ScreenUtils.java
+ 1
− 1
View file @ aec0d5eb
......@@ -17,6 +17,6 @@ public class ScreenUtils {
}
public static float densityScale(Context context) {
return (context.getResources().getDisplayMetrics().density);
return context.getResources().getDisplayMetrics().density;
}
}
build.gradle
+ 2
− 2
View file @ aec0d5eb
......@@ -2,8 +2,8 @@
buildscript {
repositories {
jcenter()
google()
jcenter()
}
dependencies {
......@@ -16,8 +16,8 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
jcenter()
}
}
......
gradle.properties
+ 3
− 1
View file @ aec0d5eb
......@@ -16,3 +16,5 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment