diff --git a/app/src/main/assets/privacy.html b/app/src/main/assets/Lock_App_Privacy.html similarity index 67% rename from app/src/main/assets/privacy.html rename to app/src/main/assets/Lock_App_Privacy.html index 6af25cd..0ca4ef0 100644 --- a/app/src/main/assets/privacy.html +++ b/app/src/main/assets/Lock_App_Privacy.html @@ -8,42 +8,37 @@ body { font-family: Arial, sans-serif; line-height: 1.6; - margin: 0; - padding: 0; - padding: 20px; - } - h1, h2 { + margin: 20px; color: #333; } + h1, h2 { + color: #0056b3; + } + h1 { + font-size: 24px; + } h2 { - margin-top: 20px; + font-size: 20px; } p { - margin: 10px 0; + margin-bottom: 10px; } - ul { - margin: 10px 0; - padding-left: 20px; - } -

Privacy Policy

-

Date: August 14, 2024

-

We provide this Privacy Policy to help you understand how we collect, use, and disclose information, including what you may provide to us or that we obtain from our products and services. We treat your privacy very seriously. Your privacy is important to us.

Information Collection and Use

For a better experience, while using our Service, we may require you to provide us with certain - personally identifiable information, such as users' name, address, location, pictures, etc. The - information that we request will be retained on your device and is not collected or retained by - us in any way and used as described in this privacy policy.

+ personally identifiable information. This may include users' names, addresses, locations, and + pictures. The information that we request will be retained on your device and is not collected + or retained by us in any way beyond what is described in this privacy policy.

The app does use third-party services that may collect information used to identify you.

-

Please refer to the privacy policy of the third-party service provider used by the +

Please refer to the privacy policies of the third-party service providers used by the application:

Log Data

-

We want to inform you that whenever you use our Service, in case of an error in the app, we +

We want to inform you that whenever you use our Service, in the case of an error in the app, we collect data and information (through third-party products) on your phone called Log Data. This - Log Data may include information such as your device Internet Protocol (“IP”) address, device + Log Data may include information such as your device's Internet Protocol (“IP”) address, device name, operating system version, the configuration of the app when utilizing our Service, the time and date of your use of the Service, and other statistics.

Cookies

Cookies are files with a small amount of data that are commonly used as anonymous unique identifiers. These are sent to your browser from the websites that you visit and are stored on - your device's internal memory.

-

This Service does not use these “cookies” explicitly. However, the app may use third-party code - and libraries that use “cookies” to collect information and improve their services. You have the - option to either accept or refuse these cookies and know when a cookie is being sent to your - device. If you choose to refuse our cookies, you may not be able to use some portions of this - Service.

+ your device's internal memory. This Service does not use these “cookies” explicitly. However, + the app may use third-party code and libraries that use “cookies” to collect information and + improve their services. You have the option to either accept or refuse these cookies and know + when a cookie is being sent to your device. If you choose to refuse our cookies, you may not be + able to use some portions of this Service.

Service Providers

We may employ third-party companies and individuals due to the following reasons:

We want to inform users of this Service that these third parties have access to their Personal Information. The reason is to perform the tasks assigned to them on our behalf. However, they @@ -103,9 +93,9 @@

Children’s Privacy

These Services do not address anyone under the age of 13. We do not knowingly collect personally identifiable information from children under 13 years of age. In the case we discover that a - child under 13 has provided us with personal information, we will immediately delete this from - our servers. If you are a parent or guardian and you are aware that your child has provided us - with personal information, please contact us so that we will be able to take the necessary + child under 13 has provided us with personal information, we immediately delete this from our + servers. If you are a parent or guardian and you are aware that your child has provided us with + personal information, please contact us so that we will be able to take the necessary actions.

Changes to This Privacy Policy

@@ -117,6 +107,6 @@

We may update the Privacy Policy from time to time. When we change the policy in a material way, a notice will be posted on our website along with the updated Privacy Policy.

If you have any questions or concerns about our Privacy Policy or data processing, please contact - us: alokamalinga207.

+ us: duhaalqudah03@gmail.com.

diff --git a/app/src/main/java/com/tool/applockpro/activity/SearchActivity.java b/app/src/main/java/com/tool/applockpro/activity/SearchActivity.java index 343328b..8c7484e 100644 --- a/app/src/main/java/com/tool/applockpro/activity/SearchActivity.java +++ b/app/src/main/java/com/tool/applockpro/activity/SearchActivity.java @@ -10,9 +10,14 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.content.Context; import android.os.Bundle; import android.text.TextUtils; +import android.util.Log; +import android.view.KeyEvent; import android.view.View; +import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; +import android.widget.TextView; +import com.tool.applockpro.ApplockSkin; import com.tool.applockpro.R; import com.tool.applockpro.adapter.AppAdapter; import com.tool.applockpro.data.MyDataBase; @@ -59,6 +64,8 @@ public class SearchActivity extends AppCompatActivity { }); } + + private void search(String text) { if (TextUtils.isEmpty(text)) { binding.searchTips.setText(R.string.text_tips); @@ -101,11 +108,18 @@ public class SearchActivity extends AppCompatActivity { private void initData() { -// binding.searchTips.setVisibility(View.GONE); -// binding.searchEdit.requestFocus(); -// InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE); -// imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, InputMethodManager.HIDE_IMPLICIT_ONLY); - + binding.searchTips.setVisibility(View.GONE); + binding.searchEdit.requestFocus(); + binding.searchEdit.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + search(binding.searchEdit.getText().toString()); + return true; + } + return false; + } + }); } diff --git a/app/src/main/java/com/tool/applockpro/activity/SetPWDActivity.java b/app/src/main/java/com/tool/applockpro/activity/SetPWDActivity.java index 9a7258e..14a2fc6 100644 --- a/app/src/main/java/com/tool/applockpro/activity/SetPWDActivity.java +++ b/app/src/main/java/com/tool/applockpro/activity/SetPWDActivity.java @@ -37,12 +37,29 @@ public class SetPWDActivity extends AppCompatActivity { private String firstPwd = ""; private String secondPwd = ""; + private boolean showClose = false; + + public static String KEY_SHOW_CLOSE = "KEY_CLOSE"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + showClose = getIntent().getBooleanExtra(KEY_SHOW_CLOSE, showClose); binding = ActivitySetPwdactivityBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); + if(showClose){ + binding.close.setVisibility(View.VISIBLE); + + }else { + binding.close.setVisibility(View.GONE); + } + binding.close.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.activity_setpwd), (v, insets) -> { Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); @@ -50,9 +67,7 @@ public class SetPWDActivity extends AppCompatActivity { }); ads = ApplockSkin.lodAd(); - chewkpwd = getIntent().getIntExtra("1", 0); - etlis.add(binding.et1); etlis.add(binding.et2); etlis.add(binding.et3); diff --git a/app/src/main/java/com/tool/applockpro/activity/SettingActivity.java b/app/src/main/java/com/tool/applockpro/activity/SettingActivity.java index e5782b6..e629f5f 100644 --- a/app/src/main/java/com/tool/applockpro/activity/SettingActivity.java +++ b/app/src/main/java/com/tool/applockpro/activity/SettingActivity.java @@ -72,6 +72,7 @@ public class SettingActivity extends AppCompatActivity { @Override public void onClick(View v) { Intent intent = new Intent(SettingActivity.this, SetPWDActivity.class); + intent.putExtra(SetPWDActivity.KEY_SHOW_CLOSE,true); intent.putExtra("1", 1); startActivity(intent); diff --git a/app/src/main/java/com/tool/applockpro/activity/WebActivity.java b/app/src/main/java/com/tool/applockpro/activity/WebActivity.java index 66cdcaf..1479e02 100644 --- a/app/src/main/java/com/tool/applockpro/activity/WebActivity.java +++ b/app/src/main/java/com/tool/applockpro/activity/WebActivity.java @@ -8,11 +8,14 @@ import androidx.core.view.WindowInsetsCompat; import android.annotation.SuppressLint; import android.os.Bundle; +import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.widget.ImageView; import com.tool.applockpro.R; + public class WebActivity extends AppCompatActivity { @SuppressLint("MissingInflatedId") @@ -31,6 +34,13 @@ public class WebActivity extends AppCompatActivity { WebView webView = findViewById(R.id.web); webView.getSettings().setJavaScriptEnabled(true); webView.setWebViewClient(new WebViewClient()); - webView.loadUrl("file:///android_asset/privacy.html"); + webView.loadUrl("file:///android_asset/Lock_App_Privacy.html"); + ImageView imclose = findViewById(R.id.close); + imclose.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/tool/applockpro/fragment/AllFragment.java b/app/src/main/java/com/tool/applockpro/fragment/AllFragment.java index a54989c..24edab6 100644 --- a/app/src/main/java/com/tool/applockpro/fragment/AllFragment.java +++ b/app/src/main/java/com/tool/applockpro/fragment/AllFragment.java @@ -3,16 +3,12 @@ package com.tool.applockpro.fragment; import android.os.Bundle; import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.tool.applockpro.ApplockSkin; -import com.tool.applockpro.R; import com.tool.applockpro.adapter.AppAdapter; import com.tool.applockpro.data.MyDataBase; import com.tool.applockpro.data.Mydao; @@ -23,7 +19,6 @@ import com.tool.applockpro.tool.Mytools; import androidx.lifecycle.Observer; import androidx.annotation.Nullable; -import java.util.ArrayList; import java.util.List; public class AllFragment extends Fragment { @@ -40,7 +35,9 @@ public class AllFragment extends Fragment { thumAdapter = new AppAdapter(requireContext(), requireActivity()); binding.allRv.setLayoutManager(new LinearLayoutManager(requireContext())); binding.allRv.setAdapter(thumAdapter); - initData(); + mydao = MyDataBase.getINSTANCE().mydao(); + tabargs = getArguments().getString("tab"); + refreshData(); return binding.getRoot(); @@ -69,16 +66,26 @@ public class AllFragment extends Fragment { }); } - private void initData() { - mydao = MyDataBase.getINSTANCE().mydao(); - tabargs = getArguments().getString("tab"); + @Override + public void onResume() { + super.onResume(); + refreshData(); + } + + private void refreshData() { + // Log.e("zzj", tabargs); if (tabargs.equals("System")) { Mytools.runIO(new Runnable() { @Override public void run() { List list = MyDataBase.getINSTANCE().mydao().getappissystem(true); - updateRecyclerView(list); + requireActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + updateRecyclerView(list); + } + }); } }); } else if (tabargs.equals("Third")) { diff --git a/app/src/main/res/drawable/im_close.xml b/app/src/main/res/drawable/im_close.xml new file mode 100644 index 0000000..8e088ad --- /dev/null +++ b/app/src/main/res/drawable/im_close.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index 6553c9f..5db2890 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -11,26 +11,24 @@ @@ -43,7 +41,9 @@ android:layout_marginStart="10dp" android:background="@android:color/transparent" android:lines="1" + android:inputType="text" android:maxLines="1" + android:imeOptions="actionSearch" android:textColor="@color/white" android:textSize="19sp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_set_pwdactivity.xml b/app/src/main/res/layout/activity_set_pwdactivity.xml index 6a120fb..da3f80c 100644 --- a/app/src/main/res/layout/activity_set_pwdactivity.xml +++ b/app/src/main/res/layout/activity_set_pwdactivity.xml @@ -9,7 +9,6 @@ tools:context=".activity.SetPWDActivity"> - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 45c97fc..7ff7a24 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -86,6 +86,7 @@ app:layout_constraintTop_toTopOf="parent" /> + + + - - - + diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml index 4768404..7ec648c 100644 --- a/app/src/main/res/layout/activity_web.xml +++ b/app/src/main/res/layout/activity_web.xml @@ -1,14 +1,21 @@ - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_app.xml b/app/src/main/res/layout/item_app.xml index 62e3316..588e0a1 100644 --- a/app/src/main/res/layout/item_app.xml +++ b/app/src/main/res/layout/item_app.xml @@ -26,7 +26,7 @@ android:id="@+id/imlogo" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="centerCrop" + android:scaleType="fitXY" android:src="@mipmap/ic_launcher" /> diff --git a/app/src/main/res/layout/number_input.xml b/app/src/main/res/layout/number_input.xml index fae5c5e..0c21177 100644 --- a/app/src/main/res/layout/number_input.xml +++ b/app/src/main/res/layout/number_input.xml @@ -18,25 +18,26 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:gravity="center_horizontal" - android:text="@string/lock_title" + android:text="@string/lock_view_input" android:textColor="@color/white" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/pin_rv" /> - + + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/text_logo" /> \ No newline at end of file diff --git a/app/src/main/res/layout/number_pin.xml b/app/src/main/res/layout/number_pin.xml index b36f712..cea9a40 100644 --- a/app/src/main/res/layout/number_pin.xml +++ b/app/src/main/res/layout/number_pin.xml @@ -7,8 +7,8 @@ \ 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 674b2b8..fc18867 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,6 +19,7 @@ Please enter the content Query is empty Confirm Your PIN + please input PIN Crea un Pin de ingreso de 4 digitos Share Rate