Skip to content

Commit 7d3cc0f

Browse files
MichaelSDavidMichaelSDavid
authored
Merge pull request #29 from MATDEV-Technologies/feature
REAL Final commit for premiere release MERGED BAYBEEEEEE
2 parents 5b5270b + 652ff19 commit 7d3cc0f

13 files changed

Lines changed: 40 additions & 26 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.matdevtech.multility">
55
<!-- Add Access to Internet, to access external APIs -->
6-
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.INTERNET"/>
77

88
<application
99
android:allowBackup="true"
@@ -17,53 +17,53 @@
1717
<activity
1818
android:name=".NavigationBar"
1919
android:label="Multility"
20-
android:parentActivityName=".MainActivity" />
20+
android:parentActivityName=".MainActivity"/>
2121
<activity
2222
android:name=".PrivacyPolicy"
2323
android:label="@string/priv_policy"
24-
android:parentActivityName=".SettingsActivity" />
24+
android:parentActivityName=".SettingsActivity"/>
2525
<activity
2626
android:name=".TermsOfService"
2727
android:label="@string/tos"
28-
android:parentActivityName=".SettingsActivity" />
28+
android:parentActivityName=".SettingsActivity"/>
2929
<activity
3030
android:name=".About"
3131
android:label="About"
32-
android:parentActivityName=".SettingsActivity" />
32+
android:parentActivityName=".SettingsActivity"/>
3333
<activity
3434
android:name=".SettingsActivity"
3535
android:label="Information"
36-
android:parentActivityName=".MainActivity" />
36+
android:parentActivityName=".MainActivity"/>
3737
<activity
3838
android:name=".TipCalculator"
3939
android:label="Tip Calculator"
4040
android:parentActivityName=".MainActivity"
41-
tools:ignore="Instantiatable" />
41+
tools:ignore="Instantiatable"/>
4242
<activity
4343
android:name=".Notepad"
4444
android:label="Notepad"
4545
android:parentActivityName=".MainActivity"
46-
tools:ignore="Instantiatable" />
46+
tools:ignore="Instantiatable"/>
4747
<activity
4848
android:name=".Stopwatch"
4949
android:label="Stopwatch"
5050
android:parentActivityName=".MainActivity"
51-
tools:ignore="Instantiatable" />
51+
tools:ignore="Instantiatable"/>
5252
<activity
5353
android:name=".PasswordGenerator"
5454
android:label="Password Generator"
5555
android:parentActivityName=".MainActivity"
56-
tools:ignore="Instantiatable" />
56+
tools:ignore="Instantiatable"/>
5757
<activity
5858
android:name=".DailyFact"
59-
android:label="Fact Generator"
59+
android:label="Daily Fact"
6060
android:parentActivityName=".MainActivity"
61-
tools:ignore="Instantiatable" />
61+
tools:ignore="Instantiatable"/>
6262
<activity
6363
android:name=".TrendingNews"
6464
android:label="Trending News"
6565
android:parentActivityName=".MainActivity"
66-
tools:ignore="Instantiatable" />
66+
tools:ignore="Instantiatable"/>
6767
<!--
6868
Remove the above line if data backups are a problem
6969
*-SOURCE of fix-*
@@ -76,14 +76,14 @@
7676
android:theme="@style/SplashScreenTheme"
7777
tools:ignore="MissingClass">
7878
<intent-filter>
79-
<action android:name="android.intent.action.MAIN" />
79+
<action android:name="android.intent.action.MAIN"/>
8080

81-
<category android:name="android.intent.category.LAUNCHER" />
81+
<category android:name="android.intent.category.LAUNCHER"/>
8282
</intent-filter>
8383
</activity>
8484
<activity
8585
android:name=".MainActivity"
86-
tools:ignore="MissingClass" />
86+
tools:ignore="MissingClass"/>
8787
</application>
8888

8989
</manifest>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22

33
// Imports
44
import android.annotation.SuppressLint;
5-
import android.content.Context;
6-
import android.content.SharedPreferences;
75
import android.os.Bundle;
8-
import android.util.Log;
96
import android.view.LayoutInflater;
107
import android.view.View;
118
import android.view.ViewGroup;
129
import android.widget.Button;
1310
import android.widget.TextView;
14-
import android.widget.Toast;
15-
1611
import androidx.annotation.NonNull;
1712
import androidx.annotation.Nullable;
1813
import androidx.fragment.app.Fragment;
1914
import java.util.Objects;
20-
15+
//import android.content.Context;
16+
//import android.content.SharedPreferences;
17+
//import android.util.Log;
18+
//import android.widget.Toast;
2119
/**
2220
* A simple {@link Fragment} subclass.
2321
* Use the {@link DailyFact#newInstance} factory method to

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
public class DailyFactAPIFetch extends AsyncTask<Void,Void,Void> {
1717
// Class var(s)
1818
String fact_data = "";
19+
int errorNum;
1920

2021
@Override
2122
protected Void doInBackground(Void... voids) {

‎app/src/main/res/layout-hdpi/item.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
android:layout_alignParentRight="true"
7676
android:layout_marginRight="18dp"
7777
android:layout_marginTop="-50dp"
78+
android:visibility="invisible"
7879
tools:ignore="RtlHardcoded">
7980

8081
<TextView
@@ -146,6 +147,7 @@
146147
android:ellipsize="end"
147148
android:text="Time"
148149
android:textColor="@color/colorPrimaryDark"
150+
android:visibility="invisible"
149151
tools:ignore="HardcodedText,RtlHardcoded"/>
150152

151153
</RelativeLayout>

‎app/src/main/res/layout-ldpi/item.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
android:layout_alignParentRight="true"
7676
android:layout_marginRight="18dp"
7777
android:layout_marginTop="-50dp"
78+
android:visibility="invisible"
7879
tools:ignore="RtlHardcoded">
7980

8081
<TextView
@@ -146,6 +147,7 @@
146147
android:ellipsize="end"
147148
android:text="Time"
148149
android:textColor="@color/colorPrimaryDark"
150+
android:visibility="invisible"
149151
tools:ignore="HardcodedText,RtlHardcoded"/>
150152

151153
</RelativeLayout>

‎app/src/main/res/layout-mdpi/item.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
android:layout_alignParentRight="true"
7676
android:layout_marginRight="18dp"
7777
android:layout_marginTop="-50dp"
78+
android:visibility="invisible"
7879
tools:ignore="RtlHardcoded">
7980

8081
<TextView
@@ -146,6 +147,7 @@
146147
android:ellipsize="end"
147148
android:text="Time"
148149
android:textColor="@color/colorPrimaryDark"
150+
android:visibility="invisible"
149151
tools:ignore="HardcodedText,RtlHardcoded"/>
150152

151153
</RelativeLayout>

‎app/src/main/res/layout-xhdpi/item.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
android:layout_alignParentRight="true"
7676
android:layout_marginRight="18dp"
7777
android:layout_marginTop="-50dp"
78+
android:visibility="invisible"
7879
tools:ignore="RtlHardcoded">
7980

8081
<TextView
@@ -146,6 +147,7 @@
146147
android:ellipsize="end"
147148
android:text="Time"
148149
android:textColor="@color/colorPrimaryDark"
150+
android:visibility="invisible"
149151
tools:ignore="HardcodedText,RtlHardcoded"/>
150152

151153
</RelativeLayout>

‎app/src/main/res/layout-xxhdpi/activity_navigation_bar.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
android:background="@drawable/nav_bar_rounded"
2828
android:elevation="16dp"
2929
android:padding="4dp"
30-
app:cnb_menuResource="@menu/menu_bottom_small"/>
30+
app:cnb_menuResource="@menu/menu_bottom"/>
3131

3232
</RelativeLayout>

‎app/src/main/res/layout-xxhdpi/item.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
android:layout_alignParentRight="true"
7676
android:layout_marginRight="18dp"
7777
android:layout_marginTop="-50dp"
78+
android:visibility="invisible"
7879
tools:ignore="RtlHardcoded">
7980

8081
<TextView
@@ -146,6 +147,7 @@
146147
android:ellipsize="end"
147148
android:text="Time"
148149
android:textColor="@color/colorPrimaryDark"
150+
android:visibility="invisible"
149151
tools:ignore="HardcodedText,RtlHardcoded"/>
150152

151153
</RelativeLayout>

‎app/src/main/res/layout-xxxhdpi/item.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
android:layout_alignParentRight="true"
7676
android:layout_marginRight="18dp"
7777
android:layout_marginTop="-50dp"
78+
android:visibility="invisible"
7879
tools:ignore="RtlHardcoded">
7980

8081
<TextView
@@ -146,6 +147,7 @@
146147
android:ellipsize="end"
147148
android:text="Time"
148149
android:textColor="@color/colorPrimaryDark"
150+
android:visibility="invisible"
149151
tools:ignore="HardcodedText,RtlHardcoded"/>
150152

151153
</RelativeLayout>

0 commit comments

Comments
 (0)