diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 92b637d..92c17f2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -14,12 +14,12 @@ android { compileSdk = 34 defaultConfig { - applicationId = "com.wp.pretty.wallpapers.selection" + applicationId = "com.wp.pretty.wallpapers.selection.test" minSdk = 23 targetSdk = 34 - versionCode = 4 - versionName = "1.3" - setProperty("archivesBaseName", "Prettywallpapers_v" + versionName + "(${versionCode})_$timestamp") + versionCode = 5 + versionName = "1.4" + setProperty("archivesBaseName", "Prettywallpapers_v" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" @@ -38,6 +38,12 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } + dataBinding { + enable = true; + } + buildFeatures { + viewBinding = true + } } dependencies { diff --git a/app/google-services.json b/app/google-services.json index fdcd4e3..c070880 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:303460456405:android:8d406898372602f1dacf5c", "android_client_info": { - "package_name": "com.wp.pretty.wallpapers.selection" + "package_name": "com.wp.pretty.wallpapers.selection.test" } }, "oauth_client": [], diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fb158f3..2c4f888 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ prettyCategories; public static String TAG = "-----AD"; private String AppId = "h66a246bc81483"; + private int i = 0; private String AppKey = "aa66c6b36a70016db7e34aae6bce0f9bd"; @Override public void onCreate() { @@ -39,7 +41,7 @@ public class PrettyWallPaper extends Application { } catch (IOException e) { throw new RuntimeException(e); } - + setentity(); } public void initad() { @@ -70,6 +72,25 @@ public class PrettyWallPaper extends Application { return prettyCategories; } } - + private void setentity() { + while (i data = list.getList(); + MyTool.runIO(new Runnable() { + @Override + public void run() { + for (PrettyPaper datalist : data) { + PrettyPaperEntity entity = new PrettyPaperEntity(); + entity.setImage(datalist.getSourceUrl()); + entity.setPaperlike(false); + PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().insertLikeData(entity); + //SecurityLockDataBase.getSecurityLockDataBase().getsecurityLockDAO().InsertSecurityEntity(entityApp); + } + } + }); + i++; + } + } } diff --git a/app/src/main/java/com/example/prettywallpapers/activity/IntoActivity.java b/app/src/main/java/com/example/prettywallpapers/activity/IntoActivity.java index a8850b0..959823e 100644 --- a/app/src/main/java/com/example/prettywallpapers/activity/IntoActivity.java +++ b/app/src/main/java/com/example/prettywallpapers/activity/IntoActivity.java @@ -31,7 +31,7 @@ public class IntoActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_into); customProgressBar = findViewById(R.id.progressBar); - countDownTimer = AdManager.showWelcomeAd(IntoActivity.this, tim, new Function1() { + /*countDownTimer = AdManager.showWelcomeAd(IntoActivity.this, tim, new Function1() { @Override public Unit invoke(Long aLong) { count = count+1; @@ -50,6 +50,18 @@ public class IntoActivity extends AppCompatActivity { return null; } }); + countDownTimer.start();*/ + countDownTimer = new CountDownTimer(1000,500) { + @Override + public void onTick(long millisUntilFinished) { + + } + + @Override + public void onFinish() { + startMainActivity(); + } + }; countDownTimer.start(); } diff --git a/app/src/main/java/com/example/prettywallpapers/activity/MainActivity.java b/app/src/main/java/com/example/prettywallpapers/activity/MainActivity.java index f62d6db..a06d70f 100644 --- a/app/src/main/java/com/example/prettywallpapers/activity/MainActivity.java +++ b/app/src/main/java/com/example/prettywallpapers/activity/MainActivity.java @@ -5,43 +5,18 @@ import android.os.Bundle; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.RelativeLayout; -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.bumptech.glide.request.RequestOptions; -import com.bumptech.glide.request.transition.Transition; -import com.example.prettywallpapers.fragment.HomeFragment; -import com.example.prettywallpapers.fragment.LikeFragment; import com.example.prettywallpapers.prettyadapter.FragmentAdapter; -import com.example.prettywallpapers.prettyadapter.ViewPaperAdapter; import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayoutMediator; -import com.youth.banner.Banner; -import androidx.activity.EdgeToEdge; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.viewpager.widget.ViewPager; import androidx.viewpager2.widget.ViewPager2; import com.example.prettywallpapers.R; -import com.example.prettywallpapers.base.PrettyWallPaper; -import com.example.prettywallpapers.prettyadapter.WallpaperAdapter; -import com.youth.banner.adapter.BannerImageAdapter; -import com.youth.banner.holder.BannerImageHolder; -import com.youth.banner.indicator.CircleIndicator; - -import java.util.ArrayList; -import java.util.List; public class MainActivity extends AppCompatActivity { private ViewPager2 viewPager2; @@ -49,14 +24,11 @@ public class MainActivity extends AppCompatActivity { private RelativeLayout relative_main; private TabLayout tabLayout; - List stringList = new ArrayList<>(); - @SuppressLint("MissingInflatedId") @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - image_set = findViewById(R.id.image_set); image_set.setOnClickListener(new View.OnClickListener() { @Override @@ -75,11 +47,15 @@ public class MainActivity extends AppCompatActivity { public void onConfigureTab(@NonNull TabLayout.Tab tab, int position) { switch (position) { case 0: - tab.setText(R.string.home); + tab.setIcon(R.drawable.table_home_src); break; case 1: - tab.setText(R.string.like); + tab.setIcon(R.drawable.table_category_src); break; + case 2: + tab.setIcon(R.drawable.table_like_src); + break; + } } }); diff --git a/app/src/main/java/com/example/prettywallpapers/activity/PrettyCategoryListActivity.java b/app/src/main/java/com/example/prettywallpapers/activity/PrettyCategoryListActivity.java index 29802d6..a7ab69d 100644 --- a/app/src/main/java/com/example/prettywallpapers/activity/PrettyCategoryListActivity.java +++ b/app/src/main/java/com/example/prettywallpapers/activity/PrettyCategoryListActivity.java @@ -46,7 +46,8 @@ public class PrettyCategoryListActivity extends AppCompatActivity { imageView_back.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showad(true); + //showad(true); + finish(); } }); recycle_name =findViewById(R.id.name_list_recycle); @@ -70,7 +71,7 @@ public class PrettyCategoryListActivity extends AppCompatActivity { @Override public void onBackPressed() { super.onBackPressed(); - showad(false); + //showad(false); } private void gotoGetData() { diff --git a/app/src/main/java/com/example/prettywallpapers/activity/PrettyPaperActivity.java b/app/src/main/java/com/example/prettywallpapers/activity/PreviewActivity.java similarity index 58% rename from app/src/main/java/com/example/prettywallpapers/activity/PrettyPaperActivity.java rename to app/src/main/java/com/example/prettywallpapers/activity/PreviewActivity.java index c7e5463..b309f59 100644 --- a/app/src/main/java/com/example/prettywallpapers/activity/PrettyPaperActivity.java +++ b/app/src/main/java/com/example/prettywallpapers/activity/PreviewActivity.java @@ -2,21 +2,22 @@ package com.example.prettywallpapers.activity; import android.Manifest; import android.annotation.SuppressLint; +import android.app.Dialog; import android.app.WallpaperManager; import android.content.ContentValues; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.os.Looper; import android.provider.MediaStore; import android.text.TextUtils; import android.util.Log; +import android.view.Gravity; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -25,15 +26,11 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; -import androidx.activity.EdgeToEdge; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import androidx.core.graphics.Insets; -import androidx.core.view.ViewCompat; -import androidx.core.view.WindowInsetsCompat; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; @@ -44,25 +41,20 @@ import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import com.example.prettywallpapers.R; import com.example.prettywallpapers.list.PrettyPaper; -import com.example.prettywallpapers.listener.SwitchType; import com.example.prettywallpapers.myvalue.MyValues; -import com.example.prettywallpapers.room.PrettyPaperDao; import com.example.prettywallpapers.room.PrettyPaperDatabase; import com.example.prettywallpapers.room.PrettyPaperEntity; -import com.example.prettywallpapers.room.mytool; +import com.example.prettywallpapers.room.MyTool; import com.example.prettywallpapers.toponad.AdManager; -import java.io.File; import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; import java.util.List; -import java.util.Set; import kotlin.Unit; import kotlin.jvm.functions.Function1; -public class PrettyPaperActivity extends AppCompatActivity { +public class PreviewActivity extends AppCompatActivity { private RelativeLayout relative_main; private TextView text_set; @@ -77,25 +69,10 @@ public class PrettyPaperActivity extends AppCompatActivity { private PrettyPaperDatabase db; private boolean liked; private List likelist; - private List LIST; + private PrettyPaperEntity entity; private PrettyPaper resource; private boolean islike1 = false; - private PrettyPaperEntity one; - private SwitchType switchType; - private String switchtype; - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == 0) { - if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { - //保存图片到相册 - downPreview(image); - } else { - Toast.makeText(this, "你拒绝了该权限，无法保存图片！", Toast.LENGTH_SHORT).show(); - } - } - } + private Dialog dialog; @SuppressLint("MissingInflatedId") @Override @@ -111,45 +88,42 @@ public class PrettyPaperActivity extends AppCompatActivity { image_share = findViewById(R.id.image_share); imageView_back = findViewById(R.id.paper_back); image_hert = findViewById(R.id.image_heart); - image_hert.setBackgroundResource(R.drawable.unselect_like); gotoGetData(); image_hert.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!islike1) { - image_hert.setBackgroundResource(R.drawable.unselect_like); - islike1 = true; - mytool.runIO(new Runnable() { - @Override - public void run() { - PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().deletelike(image); - } - }); - } else { - image_hert.setBackgroundResource(R.drawable.select_like); - islike1 = false; - PrettyPaperEntity prettyPaperEntity = new PrettyPaperEntity(); - prettyPaperEntity.setPaperlike(like); - prettyPaperEntity.setImage(image); - mytool.runIO(new Runnable() { - @Override - public void run() { - PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().insertLikeData(prettyPaperEntity); - } - }); - //Toast.makeText(PrettyPaperActivity.this,getString(R.string.like_success),Toast.LENGTH_LONG).show(); - } + image_hert.setSelected(!image_hert.isSelected()); + if (image_hert.isSelected()) { + entity.setPaperlike(true); + MyTool.runIO(new Runnable() { + @Override + public void run() { + PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().UpdateLikePaper(entity); + Log.d("dhn","----islike"+entity.getPaperlike()); + } + }); + Toast.makeText(PreviewActivity.this,getString(R.string.like_success),Toast.LENGTH_SHORT).show(); + } else { + entity.setPaperlike(false); + MyTool.runIO(new Runnable() { + @Override + public void run() { + PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().UpdateLikePaper(entity); + Log.d("dhn","----islike"+entity.getPaperlike()); + } + }); + Toast.makeText(PreviewActivity.this,getString(R.string.like_cancle), Toast.LENGTH_SHORT).show(); + } } }); - image_down.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && ContextCompat.checkSelfPermission(PrettyPaperActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(PrettyPaperActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && ContextCompat.checkSelfPermission(PreviewActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(PreviewActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0); } else { //保存图片到相册 downPreview(image); @@ -162,7 +136,8 @@ public class PrettyPaperActivity extends AppCompatActivity { text_set.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showad(); + //showad(); + showdialog(); } }); image_share.setOnClickListener(new View.OnClickListener() { @@ -179,17 +154,46 @@ public class PrettyPaperActivity extends AppCompatActivity { }); } + private void gotoGetData() { + Intent intent = getIntent(); + image = intent.getStringExtra(MyValues.PAPER_IMAGE); + MyTool.runIO(new Runnable() { + @Override + public void run() { + entity = PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().queryimage(image); + Log.d("dhn","--------------entity--"+entity.getPaperlike()); + if (entity.getPaperlike()) { + image_hert.setSelected(true); + } else { + image_hert.setSelected(false); + } + + } + }); + + Glide.with(this).load(image).addListener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, @Nullable Object model, @NonNull Target target, boolean isFirstResource) { + return false; + } + + @Override + public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target target, @NonNull DataSource dataSource, boolean isFirstResource) { + return false; + } + }).into(paper_image); + } private void showad() { - AdManager.showAD(PrettyPaperActivity.this, new Function1() { + AdManager.showAD(PreviewActivity.this, new Function1() { @Override public Unit invoke(Integer integer) { if (integer == AdManager.type_no_cache || integer == AdManager.type_show_close || integer == AdManager.type_show_fail) { - Toast.makeText(PrettyPaperActivity.this, getString(R.string.set_wait), Toast.LENGTH_SHORT).show(); + Toast.makeText(PreviewActivity.this, getString(R.string.set_wait), Toast.LENGTH_SHORT).show(); if (image != null) { loadPreview(image); } else { - Toast.makeText(PrettyPaperActivity.this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(PreviewActivity.this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); } } return null; @@ -221,8 +225,20 @@ public class PrettyPaperActivity extends AppCompatActivity { public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { SaveImage(resource); } - - + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + } + }); + } + private void LoadLockPreview(String preURl) { + Glide.with(this) + .asBitmap() + .load(preURl) + .into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + setLockWallPaper(resource); + } @Override public void onLoadCleared(@Nullable Drawable placeholder) { } @@ -236,36 +252,17 @@ public class PrettyPaperActivity extends AppCompatActivity { Toast.makeText(this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); } } - - private void gotoGetData() { - Intent intent = getIntent(); - image = intent.getStringExtra(MyValues.PAPER_IMAGE); - mytool.runIO(new Runnable() { - @Override - public void run() { - LIST = PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().queryimage(image); - if (LIST.isEmpty()) { - - } else { - image_hert.setBackgroundResource(R.drawable.select_like); - islike1 = true; - - } + private void setLockWallPaper(Bitmap lockbitmap) { + try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + wallpaperManager.setBitmap(lockbitmap,null,true,WallpaperManager.FLAG_LOCK); + Toast.makeText(this, getString(R.string.set_success), Toast.LENGTH_SHORT).show(); + }else { + wallpaperManager.setBitmap(lockbitmap); } - }); - - - Glide.with(this).load(image).addListener(new RequestListener() { - @Override - public boolean onLoadFailed(@Nullable GlideException e, @Nullable Object model, @NonNull Target target, boolean isFirstResource) { - return false; - } - - @Override - public boolean onResourceReady(@NonNull Drawable resource, @NonNull Object model, Target target, @NonNull DataSource dataSource, boolean isFirstResource) { - return false; - } - }).into(paper_image); + } catch (Exception e) { + Toast.makeText(this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); + } } private void init() { Window window = getWindow(); @@ -289,18 +286,18 @@ public class PrettyPaperActivity extends AppCompatActivity { Uri saveUri = getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, new ContentValues()); if (TextUtils.isEmpty(saveUri.toString())) { Looper.prepare(); - Toast.makeText(PrettyPaperActivity.this, getString(R.string.save_success), Toast.LENGTH_SHORT).show(); + Toast.makeText(PreviewActivity.this, getString(R.string.save_success), Toast.LENGTH_SHORT).show(); Looper.loop(); return; } OutputStream outputStream = getContentResolver().openOutputStream(saveUri); if (bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream)) { Looper.prepare(); - Toast.makeText(PrettyPaperActivity.this, getString(R.string.save_success), Toast.LENGTH_SHORT).show(); + Toast.makeText(PreviewActivity.this, getString(R.string.save_success), Toast.LENGTH_SHORT).show(); Looper.loop(); } else { Looper.prepare(); - Toast.makeText(PrettyPaperActivity.this, getString(R.string.save_fail), Toast.LENGTH_SHORT).show(); + Toast.makeText(PreviewActivity.this, getString(R.string.save_fail), Toast.LENGTH_SHORT).show(); Looper.loop(); } @@ -310,6 +307,73 @@ public class PrettyPaperActivity extends AppCompatActivity { } }).start(); } + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + if (requestCode == 0) { + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + //保存图片到相册 + downPreview(image); + } else { + Toast.makeText(this, "你拒绝了该权限，无法保存图片！", Toast.LENGTH_SHORT).show(); + } + } + } + private void showdialog() { + dialog = new Dialog(this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + dialog.setContentView(R.layout.switch_set_type); + dialog.setCancelable(false); + dialog.getWindow().setGravity(Gravity.CENTER); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT)); + dialog.findViewById(R.id.type_home).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (image != null) { + loadPreview(image); + dialog.cancel(); + } else { + Toast.makeText(PreviewActivity.this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); + } + } + }); + dialog.findViewById(R.id.type_screen).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (image != null) { + LoadLockPreview(image); + dialog.cancel(); + } else { + Toast.makeText(PreviewActivity.this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); + } + } + }); + dialog.findViewById(R.id.type_both).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (image != null) { + loadPreview(image); + LoadLockPreview(image); + dialog.cancel(); + } else { + Toast.makeText(PreviewActivity.this, getString(R.string.set_wallpaper_fail), Toast.LENGTH_SHORT).show(); + } + } + }); + dialog.findViewById(R.id.close_dialog_image).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dialog.cancel(); + } + }); + WindowManager.LayoutParams lp = new WindowManager.LayoutParams(); + lp.copyFrom(dialog.getWindow().getAttributes()); + lp.width = WindowManager.LayoutParams.MATCH_PARENT; + lp.height = WindowManager.LayoutParams.WRAP_CONTENT; + dialog.show(); + dialog.getWindow().setAttributes(lp); + + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/prettywallpapers/fragment/CategoryFragment.java b/app/src/main/java/com/example/prettywallpapers/fragment/CategoryFragment.java new file mode 100644 index 0000000..78179b9 --- /dev/null +++ b/app/src/main/java/com/example/prettywallpapers/fragment/CategoryFragment.java @@ -0,0 +1,36 @@ +package com.example.prettywallpapers.fragment; + +import android.annotation.SuppressLint; +import android.os.Bundle; + +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.example.prettywallpapers.R; +import com.example.prettywallpapers.PrettyWallPaper; +import com.example.prettywallpapers.prettyadapter.WallpaperAdapter; + +public class CategoryFragment extends Fragment { + private RecyclerView recyclerView_prettywall; + @SuppressLint("MissingInflatedId") + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View view = inflater.inflate(R.layout.fragment_home, container, false); + recyclerView_prettywall = view.findViewById(R.id.recyclerview_pretty); + setPrettyWallpaper(); + return view; + } + private void setPrettyWallpaper() { + GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(),1); + recyclerView_prettywall.setLayoutManager(gridLayoutManager); + WallpaperAdapter wallpaperAdapter = new WallpaperAdapter(PrettyWallPaper.getCategorylist(),getActivity()); + recyclerView_prettywall.setAdapter(wallpaperAdapter); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/prettywallpapers/fragment/HomeFragment.java b/app/src/main/java/com/example/prettywallpapers/fragment/HomeFragment.java index 1e9ff74..5c26cb0 100644 --- a/app/src/main/java/com/example/prettywallpapers/fragment/HomeFragment.java +++ b/app/src/main/java/com/example/prettywallpapers/fragment/HomeFragment.java @@ -1,12 +1,8 @@ package com.example.prettywallpapers.fragment; -import android.annotation.SuppressLint; import android.content.Intent; -import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -15,22 +11,20 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import com.bumptech.glide.Glide; -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; -import com.bumptech.glide.request.target.Target; +import com.example.prettywallpapers.PrettyWallPaper; import com.example.prettywallpapers.R; -import com.example.prettywallpapers.activity.PrettyPaperActivity; -import com.example.prettywallpapers.base.PrettyWallPaper; +import com.example.prettywallpapers.activity.PreviewActivity; +import com.example.prettywallpapers.base.MySpace; import com.example.prettywallpapers.list.PrettyPaper; -import com.example.prettywallpapers.listener.SwitchType; import com.example.prettywallpapers.myvalue.MyValues; -import com.example.prettywallpapers.prettyadapter.WallpaperAdapter; +import com.example.prettywallpapers.prettyadapter.DiscoverAdapter; +import com.example.prettywallpapers.room.MyTool; +import com.example.prettywallpapers.room.PrettyPaperDatabase; +import com.example.prettywallpapers.room.PrettyPaperEntity; import com.youth.banner.Banner; import com.youth.banner.adapter.BannerImageAdapter; import com.youth.banner.holder.BannerImageHolder; @@ -41,22 +35,22 @@ import java.util.ArrayList; import java.util.List; public class HomeFragment extends Fragment { - private RecyclerView recyclerView_prettywall; private Banner banner; - private List prettyPapers; - private SwitchType switchintent; - List stringList = new ArrayList<>(); + private RecyclerView discover_recycle; + private List list; - @SuppressLint("MissingInflatedId") + List stringList = new ArrayList<>(); @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment - View view = inflater.inflate(R.layout.fragment_home, container, false); + View view = inflater.inflate(R.layout.fragment_discover, container, false); banner = view.findViewById(R.id.banner); stringList.add("https://resource-sg-public.lux-ad.com/wallpaper/148499404d85516a86eeb5c2c30fafbd.jpeg"); stringList.add("https://resource-sg-public.lux-ad.com/wallpaper/989ccbceb5d165cc4b44ced23af4d5fb.jpeg"); stringList.add("https://resource-sg-public.lux-ad.com/wallpaper/b655bc8400774e2dc940b5a8291e2ca5.jpeg"); + stringList.add("https://resource-sg-public.lux-ad.com/wallpaper/ffdee201ab115879fd038a7f529d7d2c.jpeg"); + stringList.add("https://resource-sg-public.lux-ad.com/wallpaper/72306be102fb449d09c2f00190f333fd.jpeg"); banner.setAdapter(new BannerImageAdapter(stringList) { @Override public void onBindView(BannerImageHolder holder, String data, int position, int size) { @@ -67,7 +61,7 @@ public class HomeFragment extends Fragment { @Override public void OnBannerClick(Object data, int position) { //Log.d("-----data","------data"+data); - Intent intent = new Intent(getActivity(), PrettyPaperActivity.class); + Intent intent = new Intent(getActivity(), PreviewActivity.class); //intent.putExtra(MyValues.TYPE,"1"); //Log.d("-----MyValues.TYPE","------MyValues.TYPE"+MyValues.TYPE); intent.putExtra(MyValues.PAPER_IMAGE,String.valueOf(data)); @@ -76,14 +70,23 @@ public class HomeFragment extends Fragment { } }); banner.setIndicator(new CircleIndicator(getActivity())); - recyclerView_prettywall = view.findViewById(R.id.recyclerview_pretty); - setPrettyWallpaper(); + discover_recycle = view.findViewById(R.id.discover_recycle); + setDiscoverRecycle(); return view; } - private void setPrettyWallpaper() { - GridLayoutManager gridLayoutManager = new GridLayoutManager(getActivity(),1); - recyclerView_prettywall.setLayoutManager(gridLayoutManager); - WallpaperAdapter wallpaperAdapter = new WallpaperAdapter(PrettyWallPaper.getCategorylist(),getActivity()); - recyclerView_prettywall.setAdapter(wallpaperAdapter); + private void setDiscoverRecycle() { + MyTool.runIO(new Runnable() { + @Override + public void run() { + list = PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().getAllUsers(); + MySpace mySpace = new MySpace(10,20,10); + GridLayoutManager gridLayoutManager = new GridLayoutManager(getContext(),2); + discover_recycle.setLayoutManager(gridLayoutManager); + discover_recycle.addItemDecoration(mySpace); + DiscoverAdapter discoverAdapter = new DiscoverAdapter(getContext(), list.subList(153,353)); + discover_recycle.setAdapter(discoverAdapter); + } + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/prettywallpapers/fragment/LikeFragment.java b/app/src/main/java/com/example/prettywallpapers/fragment/LikeFragment.java index cb75c6e..c3edb5b 100644 --- a/app/src/main/java/com/example/prettywallpapers/fragment/LikeFragment.java +++ b/app/src/main/java/com/example/prettywallpapers/fragment/LikeFragment.java @@ -19,7 +19,7 @@ import com.example.prettywallpapers.R; import com.example.prettywallpapers.prettyadapter.LIkePaperAdapter; import com.example.prettywallpapers.room.PrettyPaperDatabase; import com.example.prettywallpapers.room.PrettyPaperEntity; -import com.example.prettywallpapers.room.mytool; +import com.example.prettywallpapers.room.MyTool; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ public class LikeFragment extends Fragment { private ImageView like_back; private LIkePaperAdapter lIkePaperAdapter; private boolean islike = true; - private List list = new ArrayList<>(); + private List list; @SuppressLint("MissingInflatedId") @Override @@ -51,10 +51,10 @@ public class LikeFragment extends Fragment { return view; } private void setRecycleLike() { - mytool.runIO(new Runnable() { + MyTool.runIO(new Runnable() { @Override public void run() { - list = PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().getAllUsers(); + list = PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().queryData(true); requireActivity().runOnUiThread(new Runnable() { @Override public void run() { diff --git a/app/src/main/java/com/example/prettywallpapers/list/PrettyPaper.java b/app/src/main/java/com/example/prettywallpapers/list/PrettyPaper.java index bdff027..bce7cec 100644 --- a/app/src/main/java/com/example/prettywallpapers/list/PrettyPaper.java +++ b/app/src/main/java/com/example/prettywallpapers/list/PrettyPaper.java @@ -5,15 +5,7 @@ import java.io.Serializable; public class PrettyPaper implements Serializable { private String sourceUrl; private String preUrl; - private boolean islike=false; - public boolean getIslike() { - return islike; - } - - public void setIslike(boolean islike) { - this.islike = islike; - } public String getSourceUrl() { return sourceUrl; diff --git a/app/src/main/java/com/example/prettywallpapers/myvalue/MyValues.java b/app/src/main/java/com/example/prettywallpapers/myvalue/MyValues.java index 6fb126c..bd70b2d 100644 --- a/app/src/main/java/com/example/prettywallpapers/myvalue/MyValues.java +++ b/app/src/main/java/com/example/prettywallpapers/myvalue/MyValues.java @@ -1,6 +1,6 @@ package com.example.prettywallpapers.myvalue; -import com.example.prettywallpapers.base.PrettyWallPaper; +import com.example.prettywallpapers.PrettyWallPaper; public class MyValues { public static final String IMAGE = "image"; diff --git a/app/src/main/java/com/example/prettywallpapers/prettyadapter/DiscoverAdapter.java b/app/src/main/java/com/example/prettywallpapers/prettyadapter/DiscoverAdapter.java new file mode 100644 index 0000000..79be3bf --- /dev/null +++ b/app/src/main/java/com/example/prettywallpapers/prettyadapter/DiscoverAdapter.java @@ -0,0 +1,62 @@ +package com.example.prettywallpapers.prettyadapter; + +import android.content.Context; +import android.content.Intent; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.bumptech.glide.Glide; +import com.example.prettywallpapers.activity.PreviewActivity; +import com.example.prettywallpapers.databinding.DiscoverRecycleViewBinding; +import com.example.prettywallpapers.list.PrettyPaper; +import com.example.prettywallpapers.myvalue.MyValues; +import com.example.prettywallpapers.room.PrettyPaperEntity; + +import java.util.List; + +public class DiscoverAdapter extends RecyclerView.Adapter { + private List mylist; + private Context mycon; + public DiscoverAdapter(Context context, List list){ + mycon = context; + mylist = list; + } + @NonNull + @Override + public DiscoverVH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + DiscoverRecycleViewBinding discoverRecycleViewBinding = DiscoverRecycleViewBinding.inflate(LayoutInflater.from(mycon),parent,false); + return new DiscoverVH(discoverRecycleViewBinding); + } + + @Override + public void onBindViewHolder(@NonNull DiscoverVH holder, int position) { + PrettyPaperEntity entity = mylist.get(position); + Glide.with(mycon).load(entity.getImage()) + .into(holder.discoverbinding.discoverRecycleImage); + holder.discoverbinding.discoverRecycleImage.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(mycon, PreviewActivity.class); + intent.putExtra(MyValues.PAPER_IMAGE,entity.getImage()); + mycon.startActivity(intent); + } + }); + } + + @Override + public int getItemCount() { + return mylist.size(); + } + + public class DiscoverVH extends RecyclerView.ViewHolder { + private DiscoverRecycleViewBinding discoverbinding; + public DiscoverVH(@NonNull DiscoverRecycleViewBinding itemView) { + super(itemView.getRoot()); + discoverbinding = itemView; + } + } +} diff --git a/app/src/main/java/com/example/prettywallpapers/prettyadapter/FragmentAdapter.java b/app/src/main/java/com/example/prettywallpapers/prettyadapter/FragmentAdapter.java index c046994..bc065ee 100644 --- a/app/src/main/java/com/example/prettywallpapers/prettyadapter/FragmentAdapter.java +++ b/app/src/main/java/com/example/prettywallpapers/prettyadapter/FragmentAdapter.java @@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; import com.example.prettywallpapers.fragment.HomeFragment; +import com.example.prettywallpapers.fragment.CategoryFragment; import com.example.prettywallpapers.fragment.LikeFragment; public class FragmentAdapter extends FragmentStateAdapter { @@ -19,6 +20,8 @@ public class FragmentAdapter extends FragmentStateAdapter { switch (position){ case 0: return new HomeFragment(); + case 1: + return new CategoryFragment(); default: return new LikeFragment(); } @@ -26,6 +29,6 @@ public class FragmentAdapter extends FragmentStateAdapter { @Override public int getItemCount() { - return 2; + return 3; } } diff --git a/app/src/main/java/com/example/prettywallpapers/prettyadapter/InfoAdapter.java b/app/src/main/java/com/example/prettywallpapers/prettyadapter/InfoAdapter.java index 92c6120..6ce105e 100644 --- a/app/src/main/java/com/example/prettywallpapers/prettyadapter/InfoAdapter.java +++ b/app/src/main/java/com/example/prettywallpapers/prettyadapter/InfoAdapter.java @@ -1,7 +1,5 @@ package com.example.prettywallpapers.prettyadapter; -import static com.example.prettywallpapers.myvalue.MyValues.*; - import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -22,7 +20,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.example.prettywallpapers.R; -import com.example.prettywallpapers.activity.PrettyPaperActivity; +import com.example.prettywallpapers.activity.PreviewActivity; import com.example.prettywallpapers.list.PrettyPaper; import com.example.prettywallpapers.listener.SwitchType; import com.example.prettywallpapers.myvalue.MyValues; @@ -69,7 +67,7 @@ public class InfoAdapter extends RecyclerView.Adapter { holder.getImage_layout().setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(context, PrettyPaperActivity.class); + Intent intent = new Intent(context, PreviewActivity.class); //intent.putExtra(MyValues.TYPE,"2"); //Log.d("-----MyValues.TYPE","------MyValues.TYPE"+MyValues.TYPE); intent.putExtra(MyValues.PAPER_IMAGE,prettyPaper.getSourceUrl()); diff --git a/app/src/main/java/com/example/prettywallpapers/prettyadapter/LIkePaperAdapter.java b/app/src/main/java/com/example/prettywallpapers/prettyadapter/LIkePaperAdapter.java index 43d941b..4ef5eda 100644 --- a/app/src/main/java/com/example/prettywallpapers/prettyadapter/LIkePaperAdapter.java +++ b/app/src/main/java/com/example/prettywallpapers/prettyadapter/LIkePaperAdapter.java @@ -8,6 +8,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -20,18 +21,18 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.example.prettywallpapers.R; -import com.example.prettywallpapers.activity.PrettyPaperActivity; +import com.example.prettywallpapers.activity.PreviewActivity; import com.example.prettywallpapers.myvalue.MyValues; import com.example.prettywallpapers.room.PrettyPaperDatabase; import com.example.prettywallpapers.room.PrettyPaperEntity; -import com.example.prettywallpapers.room.mytool; +import com.example.prettywallpapers.room.MyTool; import java.util.List; public class LIkePaperAdapter extends RecyclerView.Adapter { private List paperEntities ; private Context mycontext; - private boolean mylike; + private boolean islike; public LIkePaperAdapter(Context context,List entities){ mycontext = context; paperEntities = entities; @@ -63,28 +64,35 @@ public class LIkePaperAdapter extends RecyclerView.Adapter { return false; } }).into(holder.getImageView()); - holder.getImageView_like().setBackgroundResource(R.drawable.select_like); + islike = prettyPaperEntities.getPaperlike(); + if (islike){ + holder.getImageView_like().setSelected(true); + }else { + holder.getImageView_like().setSelected(false); + } holder.getImageView_like().setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - paperEntities.remove(prettyPaperEntities); - notifyItemRemoved(position); - mytool.runIO(new Runnable() { + holder.getImageView_like().setSelected(!holder.getImageView_like().isSelected()); + if (holder.getImageView_like().isSelected()){ + prettyPaperEntities.setPaperlike(true); + Toast.makeText(mycontext,mycontext.getText(R.string.save_success),Toast.LENGTH_SHORT).show(); + }else { + prettyPaperEntities.setPaperlike(false); + Toast.makeText(mycontext,mycontext.getText(R.string.like_cancle),Toast.LENGTH_SHORT).show(); + } + MyTool.runIO(new Runnable() { @Override public void run() { - PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().delete(prettyPaperEntities); - //PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().UpdateLikePaper(prettyPaperEntities); - // Log.d("---entities","-----entities"+entities.size()); - //Toast.makeText(PrettyPaperActivity.this,"succes",Toast.LENGTH_LONG).show(); + PrettyPaperDatabase.getPrettyPaperDatabase().getPrettyPaperDao().UpdateLikePaper(prettyPaperEntities); } }); - //mytool.updateRoom(prettyPaperEntities); } }); holder.getImageView().setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(mycontext, PrettyPaperActivity.class); + Intent intent = new Intent(mycontext, PreviewActivity.class); intent.putExtra(MyValues.PAPER_IMAGE,prettyPaperEntities.getImage()); mycontext.startActivity(intent); } diff --git a/app/src/main/java/com/example/prettywallpapers/prettyadapter/SeeAllInFoAdapter.java b/app/src/main/java/com/example/prettywallpapers/prettyadapter/SeeAllInFoAdapter.java index def2ebf..09036da 100644 --- a/app/src/main/java/com/example/prettywallpapers/prettyadapter/SeeAllInFoAdapter.java +++ b/app/src/main/java/com/example/prettywallpapers/prettyadapter/SeeAllInFoAdapter.java @@ -3,7 +3,6 @@ package com.example.prettywallpapers.prettyadapter; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -20,7 +19,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.example.prettywallpapers.R; -import com.example.prettywallpapers.activity.PrettyPaperActivity; +import com.example.prettywallpapers.activity.PreviewActivity; import com.example.prettywallpapers.list.PrettyPaper; import com.example.prettywallpapers.myvalue.MyValues; @@ -61,9 +60,7 @@ public class SeeAllInFoAdapter extends RecyclerView.Adapter queryimage(String image); + PrettyPaperEntity queryimage(String image); @Query("delete from table_name where image=:image") void deletelike(String image); } diff --git a/app/src/main/java/com/example/prettywallpapers/toponad/AdManager.kt b/app/src/main/java/com/example/prettywallpapers/toponad/AdManager.kt index 749c1f3..b9016b2 100644 --- a/app/src/main/java/com/example/prettywallpapers/toponad/AdManager.kt +++ b/app/src/main/java/com/example/prettywallpapers/toponad/AdManager.kt @@ -7,7 +7,7 @@ import com.anythink.core.api.ATAdInfo import com.anythink.core.api.AdError import com.anythink.interstitial.api.ATInterstitial import com.anythink.interstitial.api.ATInterstitialListener -import com.example.prettywallpapers.base.PrettyWallPaper +import com.example.prettywallpapers.PrettyWallPaper import com.example.prettywallpapers.myvalue.MyValues diff --git a/app/src/main/res/drawable/close_dialog.xml b/app/src/main/res/drawable/close_dialog.xml new file mode 100644 index 0000000..790631a --- /dev/null +++ b/app/src/main/res/drawable/close_dialog.xml @@ -0,0 +1,20 @@ + + + + diff --git a/app/src/main/res/drawable/dialog_type_bg.xml b/app/src/main/res/drawable/dialog_type_bg.xml new file mode 100644 index 0000000..1c9487c --- /dev/null +++ b/app/src/main/res/drawable/dialog_type_bg.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/table_category_src.xml b/app/src/main/res/drawable/table_category_src.xml new file mode 100644 index 0000000..db2d56f --- /dev/null +++ b/app/src/main/res/drawable/table_category_src.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/app/src/main/res/drawable/table_home_src.xml b/app/src/main/res/drawable/table_home_src.xml new file mode 100644 index 0000000..e7368bd --- /dev/null +++ b/app/src/main/res/drawable/table_home_src.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/table_like_src.xml b/app/src/main/res/drawable/table_like_src.xml new file mode 100644 index 0000000..fd1b586 --- /dev/null +++ b/app/src/main/res/drawable/table_like_src.xml @@ -0,0 +1,12 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0f301d7..a7dde1f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -64,16 +64,21 @@ android:layout_marginBottom="50dp" app:tabSelectedTextColor="@color/pretty_text" app:tabIndicatorColor="@color/pretty_text" + app:tabIconTint="@color/table_icon_bg" android:background="@drawable/table_bg"> + android:icon="@drawable/table_home_src" /> + + android:icon="@drawable/table_like_src" /> diff --git a/app/src/main/res/layout/activity_pretty_paper.xml b/app/src/main/res/layout/activity_pretty_paper.xml index 5186944..c778da4 100644 --- a/app/src/main/res/layout/activity_pretty_paper.xml +++ b/app/src/main/res/layout/activity_pretty_paper.xml @@ -5,7 +5,7 @@ android:id="@+id/paper_main" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".activity.PrettyPaperActivity"> + tools:context=".activity.PreviewActivity"> + android:src="@drawable/selector_like" /> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_discover.xml b/app/src/main/res/layout/fragment_discover.xml new file mode 100644 index 0000000..b4d83a3 --- /dev/null +++ b/app/src/main/res/layout/fragment_discover.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 69f0d77..ce3f8f2 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -1,24 +1,23 @@ - - + - - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_like.xml b/app/src/main/res/layout/fragment_like.xml index 08d5551..a16268e 100644 --- a/app/src/main/res/layout/fragment_like.xml +++ b/app/src/main/res/layout/fragment_like.xml @@ -12,7 +12,7 @@ android:text="@string/like" android:textSize="24sp" android:gravity="center_horizontal" - android:layout_marginTop="40dp" + android:layout_marginTop="50dp" /> diff --git a/app/src/main/res/layout/switch_set_type.xml b/app/src/main/res/layout/switch_set_type.xml new file mode 100644 index 0000000..503f3d2 --- /dev/null +++ b/app/src/main/res/layout/switch_set_type.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0592b85..ae27b50 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,7 +6,8 @@ #5B8BED #415E9A #91ABDF - #779EED - #C4D1EC - #4F72B8 + #779EED + #C4D1EC + #4F72B8 + #49454F \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5eea054..cd0287a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,8 @@ Hello blank fragment Home + Discover + Recommend Like Likes have been added Likes have been canceled @@ -13,4 +15,9 @@ Setting wallpaper, please wait The save was successful Sorry,Save failed + Home screen + Lock Screen + Both + Set wallpaper + categoriza \ No newline at end of file