Skip to content

Commit 3dd022c

Browse files
Merge pull request #25 from MATDEV-Technologies/working
Added full support for all screen densities MERGED
2 parents 99ef961 + 62c3ecb commit 3dd022c

124 files changed

Lines changed: 7370 additions & 519 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,6 @@ Multiple utilities in one. A summer project. Android is the main and original pl
5858
- **Commit Workflow**:</br>
5959
!["workflow_gh.jpg"](https://cdn.discordapp.com/attachments/342481673822404608/726630332136423434/github_commit_flow.png)</br></br>
6060

61-
(Social image URL: bit.ly/3dOuRtm (disabled for being a private repo))
61+
(Social image URL: bit.ly/3dOuRtm (disabled for being a private repo))</br></br>
62+
63+
(Archived files: [./res/layout/spinner_styles.xml](https://cdn.discordapp.com/attachments/342481673822404608/740279216548872362/spinner_styles.xml), [./res/layout/spinner_dropdown_styles](https://cdn.discordapp.com/attachments/342481673822404608/740279213713522758/spinner_dropdown_styles.xml))

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
android:parentActivityName=".SettingsActivity" />
3333
<activity
3434
android:name=".SettingsActivity"
35-
android:label="Info"
35+
android:label="Information"
3636
android:parentActivityName=".MainActivity" />
3737
<activity
3838
android:name=".TipCalculator"

app/src/main/java/com/matdevtech/multility/About.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
// Main class
99
public class About extends AppCompatActivity {
10-
1110
// Activity init
1211
@Override
1312
protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/matdevtech/multility/Adapter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@
1111
import com.bumptech.glide.request.target.Target;
1212
import com.matdevtech.multility.models.Article;
1313
import java.util.List;
14-
//import org.w3c.dom.Text;
1514
import android.annotation.SuppressLint;
1615
import android.content.Context;
1716
import androidx.annotation.NonNull;
1817
import androidx.annotation.Nullable;
1918
import androidx.recyclerview.widget.RecyclerView;
20-
2119
import android.content.Intent;
2220
import android.graphics.drawable.Drawable;
2321
import android.net.Uri;
2422
import android.view.LayoutInflater;
2523
import android.view.View;
2624
import android.view.ViewGroup;
27-
//import android.graphics.drawable.Drawable;
2825
import android.widget.ImageView;
2926
import android.widget.ProgressBar;
3027
import android.widget.TextView;
31-
import android.widget.Toast;
28+
//import org.w3c.dom.Text;
29+
//import android.widget.Toast;
30+
//import android.graphics.drawable.Drawable;
3231

3332
// Main Class
3433
public class Adapter extends RecyclerView.Adapter<Adapter.MyViewHolder> {
34+
// Class vars
3535
private List<Article> articles;
3636
private Context context;
3737
private OnItemClickListener onItemClickListener;
@@ -93,7 +93,7 @@ public int getItemCount() {
9393
return articles.size();
9494
}
9595

96-
@SuppressWarnings("SillyAssignment")
96+
@SuppressWarnings({"SillyAssignment", "unused"})
9797
public void setOnItemClickListener(@SuppressWarnings("unused") OnItemClickListener onItemClickListener) {
9898
//noinspection ConstantConditions
9999
this.onItemClickListener = this.onItemClickListener;

app/src/main/java/com/matdevtech/multility/DailyFact.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
// Main class
2727
public class DailyFact extends Fragment {
28-
28+
// Class vars and consts
2929
@SuppressLint("StaticFieldLeak")
3030
public static TextView fact_text;
3131
@SuppressWarnings({"FieldCanBeLocal", "unused"})

app/src/main/java/com/matdevtech/multility/DailyFactAPIFetch.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// Main class
1515
@SuppressWarnings({"unused", "deprecation"})
1616
public class DailyFactAPIFetch extends AsyncTask<Void,Void,Void> {
17-
17+
// Class var(s)
1818
String fact_data = "";
1919

2020
@Override

app/src/main/java/com/matdevtech/multility/MainActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
// Main class
1313
public class MainActivity extends AppCompatActivity implements View.OnClickListener{
14-
1514
// Class const(s)
1615
public static final String FRAGMENT_INT = "com.matdevtech.multility.FRAGMENT_INT";
1716

app/src/main/java/com/matdevtech/multility/NavigationBar.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
// Main class
1313
public class NavigationBar extends AppCompatActivity {
14-
1514
// Class vars
1615
private static final String TAG = NavigationBar.class.getSimpleName();
1716
String fragment_int;

app/src/main/java/com/matdevtech/multility/NewsDetailActivity.java

Lines changed: 0 additions & 69 deletions
This file was deleted.

app/src/main/java/com/matdevtech/multility/Notepad.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.matdevtech.multility;
22

3-
// TODO: Maybe add autosave, Word-like formatting, and clear all formatting (EX will clean up warnings later)
3+
// TODO: Maybe add autosave, Word-like formatting, and clear all formatting
44

55
// Imports
66
import android.annotation.SuppressLint;
@@ -34,15 +34,14 @@
3434
* create an instance of this fragment.
3535
*/
3636
public class Notepad extends Fragment {
37-
3837
// Class vars and consts
3938
private EditText notepad_edit;
4039
private static String noteText;
4140
public static final String SHARED_PREFS = "sharedPrefs";
4241
public static final String NOTE = "note";
43-
// public static String selectedText;
4442
boolean bold_button_pressed = false;
4543
boolean italic_button_pressed = false;
44+
// public static String selectedText;
4645

4746
// TODO: Rename parameter arguments, choose names that match
4847
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER

0 commit comments

Comments
 (0)