Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrading Candybar + making it fully FOSS #14

Merged
merged 2 commits into from
Jul 10, 2022
Merged

Upgrading Candybar + making it fully FOSS #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c27aebf
Upgrading Candybar + making it fully FOSS
Donnnno May 10, 2022
5c32e83
Update build.gradle
Donnnno Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
* If you've missed some versions you've to also follow update guide for those versions
*/

implementation 'com.github.zixpo:candybar:3.13.3'
implementation 'com.github.Donnnno:candybar-foss:3.14.2'

// TODO: Remove `//` below to enable OneSignal
//implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@
package="io.github.PapirusDevelopmentTeam.papirus_icons">

<!-- If you are not using donation and premium request, you need to remove BILLING permission -->
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<!-- If you are not using license checker, you need to remove CHECK_LICENSE permission -->
<uses-permission android:name="com.android.vending.CHECK_LICENSE" />

<supports-screens
android:smallScreens="true"
android:normalScreens="true"
Expand All @@ -36,7 +32,8 @@
android:launchMode="singleTop"
android:noHistory="true"
android:screenOrientation="portrait"
android:theme="@style/CandyBar.Theme.Splash">
android:theme="@style/CandyBar.Theme.Splash"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -50,7 +47,8 @@
android:name="io.github.PapirusDevelopmentTeam.papirus_icons.activities.MainActivity"
android:launchMode="singleTop"
android:theme="@style/CandyBar.Theme.App"
android:configChanges="uiMode|orientation|keyboardHidden|screenSize">
android:configChanges="uiMode|orientation|keyboardHidden|screenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
Expand Down Expand Up @@ -201,7 +199,8 @@
android:value="@color/muzei_color" />
</provider>

<receiver android:name="io.github.PapirusDevelopmentTeam.papirus_icons.services.ClockWidget" android:label="Clock Widget">
<receiver android:name="io.github.PapirusDevelopmentTeam.papirus_icons.services.ClockWidget" android:label="Clock Widget"
android:exported="false">

<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
Expand Down
9 changes: 1 addition & 8 deletions ...src/main/java/io/github/PapirusDevelopmentTeam/papirus_icons/activities/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,11 @@

import candybar.lib.activities.CandyBarMainActivity;

import io.github.PapirusDevelopmentTeam.papirus_icons.licenses.License;

public class MainActivity extends CandyBarMainActivity {

@NonNull
@Override
public ActivityConfiguration onInit() {
return new ActivityConfiguration()
.setLicenseCheckerEnabled(License.isLicenseCheckerEnabled())
.setLicenseKey(License.getLicenseKey())
.setRandomString(License.getRandomString())
.setDonationProductsId(License.getDonationProductsId())
.setPremiumRequestProducts(License.getPremiumRequestProductsId(), License.getPremiumRequestProductsCount());
return new ActivityConfiguration();
}
}
109 changes: 0 additions & 109 deletions app/src/main/java/io/github/PapirusDevelopmentTeam/papirus_icons/licenses/License.java
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.0.4'
}
}

Expand All @@ -19,8 +19,8 @@ allprojects {

rootProject.ext {
MinSdk = 16
TargetSdk = 30
CompileSdk = 30
TargetSdk = 31
CompileSdk = 31
}
}

Expand Down